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

* commit '8f9cb5e76df0e728b8aaa61f72f101db8eb930a6':