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

Change-Id: Ic297a3643a0f01d6d8315b973c2e0863d193446a