Merge "Using UserManagerInternal for access control instead of UserManager" into pi-dev