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

Change-Id: I1bd7dd4b63c5f2a958f4933d095ae9f4a61500e1