This reverts commit a10ae786. Reason for revert: No longer required Bug: 31357497 Bug: 12687968 Change-Id: I9e8a6d5f61196d97379bdc2e914b55d74e37a187 Test: presubmit