Merge "Fix a grammatical mistake in javadoc."