Merge "Fix a typo in javadoc"