Merge "adb: fix adb usb operations on device." into nyc-dev
am: f92838c

* commit 'f92838ca1d5e315943022b7225a6c97c6c1283f4':
  adb: fix adb usb operations on device.

Change-Id: I852d27c8eccf2536f3733d59c9d712eeb6bef6f9