fix merge race (#9277)
fix merge race (#9277)

* fix merge race

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

Mirrored from https://github.com/envoyproxy/envoy @ 8d99679bb28ef50a7f04d62a5903bbefd8ff603a

lyft/envoy-api,lyft/envoy-api,lyft/envoy-api