Merge "Expand virtio_block check to other virtual devices" into pie-gsi