Merge "Add handling for DEVNAME for usb devices"