Merge "Fix a trivial comment typo."