Cleanup container rm funcs Upstream-commit: de318d8c1d980066db8e94825d0529698095536c Component: engine