This is part of the move to support podman in kayobe. Change-Id: I9899ca0542b81d6e3752c464bdebfb14cbf0ed48