am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API."

* commit '372d21ad69a43e3d0a26b23f45351511ed88e9e6':
  Update HttpResponseCache to use the new cache API.