Merge "Fix incorrect javadoc links" am: 0d954557a1 am: cd1c75ae4c
am: f2183961a9

Change-Id: Icf157b65308e7de18b51aec837b8c29baa5a1918