This reverts commit e24f1b09. Reason for revert: b/123172409 Change-Id: Ic5863a8e8b36c8c4d8636cc4c004ad9606a3f523