Merge "Fix default vm images"