This reverts commit 989ee924. Reason for revert: b/324032237 Change-Id: Icab1cfbcc4e33692469b56a737a611195c5407ee