Merge "Use existing PermissionManager calls in UserAuthority"