Bug: 159260556 Bug: 79776455 This reverts commit fec0165e. Reason for revert: b/159260556 Change-Id: I9f1883291591322704ee15847f4d0a285a44f8d1