Snap for 9807509 from ee061705d4121a2435e3e354cb83cc8b0d87e80a to emu-33-release

Change-Id: Ief65605522de16cd5018432a2daf43c42675697f