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

Change-Id: I2336a38fb00f2c53406718e4e3a47f989ed1c094