Merge "Fix comment typos."