Merge typo fix.
Fix typo in generated files.