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