Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
am: f5a2fbc156

Change-Id: I37eb8462dcf65783d64c71336ee0d7fc8a354c4e