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

* commit 'd7f60557b0839f088d0b0091cb07761c45436699':

Change-Id: I48ec6466db40f0f93fb5ff22dfc8d89e4314d722