Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev