This reverts commit 663ff4b3. Reason for revert: Broke the mac_sdk Exempt-From-Owner-Approval: Fixing mac_sdk Change-Id: I8184ec58e74d62dca0deafb39340d4bd36bf40e0