Refactor missed dockerCmd changes Upstream-commit: 6c95040e3b75725cb7230d7f9a22fdf36a4bb03a Component: engine