Merge "docs: Fixing P1 formatting problem on Javadocs" into oc-mr1-dev