Merge "Allow multiple device entries in usb-car-handler"