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

Change-Id: Ic7067c8671db70ae4aa70efa10a40b52dfc69349