Merge "Migrate RoleControllerManager to ServiceConnector"