Merge "Fix javadoc typo causing broken links" into oc-mr1-dev