* commit 'edf7b4c8':
  Revert "Revert "Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""""