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