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