Bug: 159260556 Bug: 79776455 This reverts commit 6a9945a3. Reason for revert: b/159260556 Change-Id: Ib2d293c82eebdbff172a89290a6bd6bba2b3ee15