Merge "Add RoleManagerService as a boot phase"