Merge "Make slight API and doc adjustments" into oc-mr1-dev
am: 1407bdd635  -s ours

Change-Id: I1207989a31cc91ca07a82fedd307a05581085b2b