Removing Custom Images support Upstream-commit: b215c4c9748c008b5bdcd3ea267ac21e666da1ff Component: engine