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

Change-Id: I0ca6a8824a2f89867e85fea6ee8d97f6dd3a1acf