Merge "Don't depend on shadow IRoleManager."