Merge "Trivial comment typo fix"