Merge "Fix a typo in a comment"