Merge "Rename vendorExtension fields to vendorInfo."