Merge "Regenerate generated files after upstream sync."