Snap for 11228863 from c30bfd0017f78f5b4a962a45cf448eb6a0e05f23 to emu-34-release

Change-Id: Ia192c9a78695c17c479178c746360e145238cee3