Merge "Revert "replace UserManagerInternal with UserManager""
tree: 2ab4f4a4253801d523fe1f40e5e6270753cf4a77
  1. framework/
  2. service/