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