Snap for 5031425 from ef07d14701d450e0a7b30c30c80624791852cf97 to emu-master-qemu-release

Change-Id: Iecf39673b27b9651d8781fc5312c60437c244e52