Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."