This reverts commit 662c5b31. Exempt-From-Owner-Approval: to fix broken build sdk_mac Change-Id: Ib8985f653895ab5573ba17c083b77f00a5bb78ee