Adding error codes to image package Upstream-commit: 793a40908155c87435e676646a23a413616dda6d Component: engine