Merge "Address API review for UserManager user creation" into nyc-dev
am: 25c66ac

* commit '25c66ac8e66f67aeb100bd808ff52a2cda0294fb':
  Address API review for UserManager user creation

Change-Id: I40f9c392abc8fc1b5303fd09be93c49ab675e1b4