Merge "Snap for 5031425 from 315fb5b8a73df3f88c79a034968a87b461833a83 to emu-master-qemu-release" into emu-master-qemu-release