Merge "Fix the build breakage due to incorrect javadoc link"