Merge "Test changes for the HttpURLConnection fallback strategy"