Event tests need retry logic Upstream-commit: 916e9ad75472bb5a0ab7acf9515a4d369248791d Component: engine