Merge "Change qemu-img resize unit"