Merge "Remove vendor_service."