Merge "adb: win32: test USB kick on resume from sleep/hibernation" am: a23ba9f61a am: c3f4997bfa
am: 5db1b0a6c9

Change-Id: I6136e3216272fb74a9f77db27f76aed9ce578f1a