am 8dabf9fd: am 1cd7f9e9: Merge "Copy cache header for 304 response"

* commit '8dabf9fd2a73ff5926902a7354f63724247a41c9':
  Copy cache header for 304 response