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