Merge "Update vm prepare setup"