This reverts commit cfb26e3b. Reason for revert: b/169747069 Change-Id: I9290708aea6a66bbecc098b75403f6e5d7e77ec7