This reverts commit 8e18a0ab. Exempt-From-Owner-Approval: Revert to re-add approved change Change-Id: I5b5195470f365a2347cbf444cc0494d119e42ffc