Minor code simplification for Containers api Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f Component: engine