Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93f
* commit '59c9a93f':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee8 to nyc-dev
Change-Id: I3ce213d0e7412125861d39f1726be4b5a751c828