Merge "Merge cherrypicks of [934000] into emu-3.1-release" into emu-3.1-release