Snap for 10957805 from 4142446b3c44577d088bf5681b69453abafa8ee6 to emu-34-release

Change-Id: Iab87dd62dd721bc5f1b20e32164c5c4639df3754