This reverts commit 7890baea. Reason for revert: b/73224471 Bug: 73224471 Bug: 72116995 Change-Id: Ife5dc5c14026ae7dcb126b0b3c3e7701ed3eaebe