Merge "Add a 1000msec timeout for adb's USB control packets"