Merge "Use UserManagerInternal to avoid permission check" into udc-dev