Upgrade emulator to emu-master-dev build 6428502 am: ca5ba3fda1

Change-Id: I81de1286d56a4e33703d5a1d0a4fa771f53888a7