Merge "Change HttpsURLConnectionTest for okhttp update."