Merge "Fix typo in javadoc."