Merge "Fix adb tcpip tests." am: d865b655d5 am: 37f256423b am: 7096d47858
am: 22d9a9a249

Change-Id: Ica6d1a10e043c4d2abc9baf0f6521636bd0d9ec0