Merge "Fix OldResponseCacheTest. Null headers were causing our HttpClient to reject the cache entry."