This reverts commit 6c36583a. Reason for revert: b/155466646 Exempt-From-Owner-Approval: Revert to fix bug Bug: 155466646 Change-Id: Ifc771bd17d697bee94c26b525cc3d334469756e4