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

Change-Id: I74141f17f116f4be59f8925868894c805ee1fec2