Merge "Request-local caching of image_redirect"