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

Change-Id: I1b3005ef17b9d54e1f9b9c75138d214e80fc414c