Merge "UsbDeviceManager: Fix indentation"