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

Change-Id: I8700221b7f2b29bdb3524c0e2caa181437bbb0cc