Some container/network cleanups Upstream-commit: 6f68db8c7a94489b5e66bb828f748d0baa2e5c22 Component: engine