Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93 am: cf24be99bb
am: 13b71453fa

Change-Id: I302fce455320318598d573739cd0ebee4ee499bb