Merge "Add wait_for_volume_status in upload_to_image test"