Add cleanup when container.Start fails Upstream-commit: 34745ee0f4d487fd1eb6c6e1cdac1672deb26658 Component: engine