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

Change-Id: I090e1011627ce618623b132e2624cc1008d2ea1f