google zones, images and disks changes as part of #425