Merge "Make RoleUserState use its own lock."