Merge "Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1" into oc-dev am: 46802905f5
am: 0e6b584116

Change-Id: Iedd3941d4bf4fcabd6ed24d510f54f4c5b71d903