Merge "usb: correct Product id"