Move Container to its own package (carry of 17969) Upstream-commit: 168b490062aed36bf95426d9d66dcf5703842016 Component: engine