Fixing Image struct to no longer use Graph. Upstream-commit: cc7fe0d2d96137e000f98d3917e60ab904e5f170 Component: engine