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

Change-Id: I7adb6b257080c28a8cabd1e99d436d77ce5dbaa2