Merge "Fix a comment typo"