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

Change-Id: Id17bb6f9a4609b09a1425392bd1b4e8840e7eb1d