Merge "Snap for 4552601 from 086d8c086d54a89bcd5af7b87a56786b3edcc783 to emu-2.6-release" into emu-2.6-release