Fix race with TestContainerApiCommit Upstream-commit: 59acccb6f2dae4659797636196dfde7263789923 Component: engine