am 82fe3d24: Merge "Revert "Rewrite mac_permissions.xml file.""

* commit '82fe3d249f40629fe40f4feed258cccd95b2a374':
  Revert "Rewrite mac_permissions.xml file."