Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: c0d2c43

* commit 'c0d2c43a22c9a0feda8d651d432aa3893e0cf952':

Change-Id: I239987188f9bc78b0986b9cf5946decf960c72c4