Merge "Fix comment typos. =("