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

Change-Id: I4f1be5a8e373659a3a9e5eb11c2629427277f50b