Emulator updates.
Merge pull request #763 from umaar/devtools-emulation-updates

Emulator updates.