Merge "Fix incorrect javadoc links"