Merge "Fix javadoc build break s/line/link/"