Merge "Modify BYD's USB Vendor ID"