Fix checkpoint's exiting semantics. Upstream-commit: c3a02077149ea8ee1d53b2b60a3d36c29d1505f8 Component: engine