Merge "Fix typo in javadoc." into jb-dev