Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev