Merge "Revert "Revert "Rewrite mac_permissions.xml file."""