am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

* commit 'f5f345cf929908bd863143815743c44778d29e4a':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.