Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev
am: 6af2db3824

Change-Id: Idae2d16055e26e721584e428c44af0f2b1828557