Merge "Revert^2 "Expose role API for Settings on RoleManager.""