This reverts commit 9268360c. Reason for revert: b/172034430 Change-Id: If3d2a2a0ec0ace50d015d35ce5c39d6242a45d2e