Merge "Workaround: Do not send command to a disconnected usb subsystem" into oc-dr1-dev
am: 2cfb8392cb

Change-Id: Icdf69b557873f8983b2671e76e076f0370f83791