Merge "Fix javadoc typos" into oc-dev