Merge "Fix build due to bad javadoc link."