Merge "Fix typo in comments."