Merge "Snap for 4978495 from 94a6f539e121313c3da9704e9ea5c02a65bda3f5 to emu-master-qemu-release" into emu-master-qemu-release