This reverts commit 35274cb0. Reason for revert: b/78110749 Fixes: 78110749 Change-Id: Ib1b15e4f7325cb265574090b658514fc0b3c4021