Merge "Revert "replace UserManagerInternal with UserManager""