Merge "Fix javadoc typo"