This reverts commit 2dc254ac. Reason for revert: Broke the mac_sdk Exempt-From-Owner-Approval: Fixing mac_sdk Change-Id: Ie8706d7846f725a4786a2e9f9a369ee2bc549838