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