Merge "-e is really about TCP/IP devices, not emulators."