Upgrade emulator to emu-master-dev build 5649648 am: f9a29c35e7
am: 23b7ff544e

Change-Id: I424afcb69ee58945b2e897c5398eeadcfc00834d