Remove Docker from some functions Upstream-commit: 0e037717e06f4f260f4e76d90675ccd1e9a6bed3 Component: engine