This reverts commit 16bfa11b. Reason for revert: Revert until b/76138670 is fixed Bug: 64382372 Bug: 76138670 Bug: 76157445 Change-Id: Iaf6c76b773fbea4d4710b38808dee2e7e06f5e78