Merge "adb: don't reset usb when connecting it."