Cherry-pick of https://github.com/envoyproxy/envoy/pull/9862#133

kyessenov merged 1 commit intoistio:release-1.4istio/envoy:release-1.4from

kyessenov:harden_context_14kyessenov/envoy:harden_context_14Copy head branch name to clipboard