Merge "Fix a typo in a javadoc comment"