This reverts commit 17215227. Reason for revert: b/244521023 Change-Id: I67df39f4d218ff65cb7a2010b544c3ef158f50cf