Merge "Fix URLConnectionTest#testConnectTimeouts."