Fix retry logic for out of sequence errors Upstream-commit: 10a3a269a0c61bd63d6c694975bbe37aaf66672b Component: engine