Merge "Cherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting. Original-Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f"