Merge "UsbDeviceManager: delete obsolete code"