Merge "Fix checked in comment typos."