Merge "Merge "Small doc fix." into oc-dev am: 0f98ddaa01 am: e7de4716f0" into oc-dr1-dev-plus-aosp