Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev am: 7835c650b2
am: 7ad3eb8db0  -s ours

Change-Id: Ib0b4de07702d6a7337e47f72fe1b5d31039a5454