Merge "Fix typos in comments."