Merge "Upgrade emulator to emu-master-dev build 6935186"