This reverts commit5b75774004
. Exempt-From-Owner-Approval: cherry-pick from internal Bug: 151051671 Test: m Merged-In: I05f0465976098941d47ecc06c978cfa116364d78 (cherry picked from commitaf7ed39b06
) Change-Id: I05f0465976098941d47ecc06c978cfa116364d78