This reverts commit fa915cb5. Reason for revert: b/188455492 Bug: 188455492 Change-Id: Ie18a8cd234a8ecf5a7fc0d6c5cdf05f158f3a7e6