Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev am: b1748f87b1
am: 152be97c2e

Change-Id: I1bde702c235218e35e0592aedb7491f1a2ff2582