Merge "documentation fixes" into nyc-mr1-dev am: 14826e5489
am: b1e3d9ab26

Change-Id: I4f2682c11384a9f656054b95cfba56132085634a