This reverts commit 4b7c48ac. Exempt-From-Owner-Approval: to fix broken build sdk_mac Change-Id: Id0782757c00070556340dce2dc2c8a211910c76b