Merge "Fix a typo in comment"