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

Change-Id: I6f212225b8fe88235d4803b1129b66f5d650d1e4