am e6f426a1: am fe216ddd: am b3c134e1: Merge "Revert "Revert "Permissions: Fix account related permissions.""" into mnc-dev

* commit 'e6f426a109aff7b081f9dc59722cee80c1092e91':
  Revert "Revert "Permissions: Fix account related permissions.""