Merge "diag: Do not write to USB when usb is disconnected"