Merge "Fix javadoc typo causing broken links" into oc-mr1-dev
am: ac2cdc0dba

Change-Id: Ib8d63b1bfcc20e398314501a51bd2fad76a8d10e