Merge "Fix some typos in comments"