Merge "adb: don't reset usb when connecting it." am: 4b8087aeb2 am: 0c1bad300c
am: e7affdc47c

Change-Id: Ibe2772d021a51281263a0bdaf83d2157b71f03e6