Merge "Fix incorrect javadoc link"