Merge "Fix incorrect javadoc links"
am: 0d954557a1

Change-Id: Id358aab44d8e77561a9b5cb27c363d2325a79086