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

Change-Id: I41b7515376760eccfba146135c44cfe1ec9b4bf3