am 84a0ff18: am 1cd7f9e9: Merge "Copy cache header for 304 response"

* commit '84a0ff18b2ebc30aafd2eb08b5fb09f2872008f7':