This reverts commit b5cd4cc2. Reason for revert: b/173742005 Change-Id: I4bc71de39269f2f37101f94bf0c3b3a5158e7e9d