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: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370