Snap for 5031425 from 85d66e75bbef8ebbeb54bfb469b4df768fa568ee to emu-master-qemu-release

Change-Id: I3d74d49c060288de02d013c455abe8dbc26880bd