Merge "Upgrade emulator to emu-master-dev build 6946397" into rvc-qpr-dev