Merge "Update generated files."