Merge "Fix broken javadocs." into oc-mr1-dev