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