Refactor to new engine-api events api Upstream-commit: 8c929eeb34673752d1bbaf7e9e52731bf6171b37 Component: engine