Merge "Fix typo in Javadoc."