Add -d option to vanilla images

Change-Id: I79e60b26747c62d50940b4387ad823ea6fca5220