This reverts commit 575d8846. Reason for revert: b/266431114 Change-Id: Ib617884f27cbb9ff1aa1f66eddcfcce83904c056