Merge "Bound the ADB connect time with a non-blocking connect"