Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev