fix merge snafu (#12380)
fix merge snafu (#12380)

Signed-off-by: Asra Ali <da4828c05ee1cc5a64445440d12151dedd1ac4a8@google.com>
lizan/envoy,envoyproxy/envoy,lyft/envoy,envoyproxy/envoy-wasm,lizan/envoy,envoyproxy/envoy-wasm,lizan/envoy,envoyproxy/envoy,envoyproxy/envoy,lizan/envoy,lizan/envoy,envoyproxy/envoy-wasm,lyft/envoy,envoyproxy/envoy,envoyproxy/envoy-wasm,envoyproxy/envoy,lyft/envoy,envoyproxy/envoy-wasm,envoyproxy/envoy-wasm,envoyproxy/envoy,lyft/envoy,envoyproxy/envoy,envoyproxy/envoy,lyft/envoy,envoyproxy/envoy,envoyproxy/envoy-wasm,lizan/envoy,envoyproxy/envoy,envoyproxy/envoy,lyft/envoy,envoyproxy/envoy