Merge "Upgrade emulator to emu-master-dev build 4486342"
am: 8d05e74812

Change-Id: I03c72cef76c33462e0680a1dcda45a9f7779617c