This reverts commit c50ae9c6. Reason for revert: b/270300283 Change-Id: I7da15937b200e707847bcf1403d4a7ac55c0822c