Merge "Remove unneeded vendor_available"