Use diff ids from image configuration Upstream-commit: 6efdac4291bfb2eec1360991596e93707287275c Component: engine