Merge "Update extension enums to match upstream."