This reverts commit 8c61d7b4. Reason for revert: b/72969557 Bug: 72969557 Bug: 72566647 Change-Id: I46bebf253f1dcb5abfdff2f56022675c1dd44219