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

Change-Id: I662ac186b079d88fc503fa546b52b1297b98a036