Snap for 5031425 from 8e2a5472dd374e6c971d30eb3d00898a8c1a25c8 to emu-master-qemu-release

Change-Id: Ib4d2f8b77554071b8c4f85034b5ebace21c9db49