Merge "Use a boolean Consumer instead of RoleManagerCallback."