Merge "URLConnectionTest changes for upgrade to OkHttp 2.7.5"