Resolve connection reset by peer regression Upstream-commit: 595ea2f12096e668977808ccea72f74a9e7c2ab7 Component: engine