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

Change-Id: Iec79324767e1a44c86b00fc86662b6fb7d37bc17