Merge "Snap for 6837279 from df6bc4ade7d8a2923269e543b27175eeee26e90b to emu-30-release" into emu-30-release