Merge "Address API review for UserManager user creation" into nyc-dev