This reverts commit d4d52368. Reason for revert: b/148087431 Bug: 148087431 Change-Id: I469133e058d9f6a272d7340740ba1c369ba60030