This reverts commit 69a32df2.

Reason for revert: relanding

Exempt-From-Owner-Approval: approved by enh

Bug: 150999716
Test: m (on adt3)

Merged-In: I022ce8459039c11f62d7f7f4e6e1a822489da953
Change-Id: I3fef1b8b8b9e307d07e10cabcb7223ab878beb11