Refactor and cleanup the intermediate container creation Upstream-commit: 52ea99eda2ea29d9a0e4111f1e7a0b382d8d9408 Component: engine
Refactor and cleanup the intermediate container creation Upstream-commit: 52ea99eda2ea29d9a0e4111f1e7a0b382d8d9408 Component: engine