This reverts commit f6010042. Reason for revert: b/231244396 Change-Id: Ibc922d80fd85c7a8060d9a8ec667345643dce614