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

Change-Id: I7d3bd8f949d4b7607747916b541b8c2b80807598