Merge "Use RoleManager in AppBindingService"