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

Change-Id: Iecae5becb23a80e0b8322a655ce75125a33cbdc8