Snap for 10363732 from 030c450d3636dd3fce703e1a96ff2789189e31a0 to emu-33-release

Change-Id: Iff07422a793ef17a6c7f753b44def936da5ffb04