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

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