This reverts commit 9cd7a399. Reason for revert: broke git_master/adt3-userdebug Exempt-From-Owner-Approval: reverting Change-Id: I34f50814a1bba0210ada6c0a81ec815e11de7bc8