Merge "Support losing the upstream in IpServerTest." am: a429d3b551 am: fc63250a1a

Change-Id: Ic77f0af05fe094485ce78fd44c2f2d009a257164
tree: 8c9715d0e90c97219bd89186fafbe30350665f79
  1. Tethering/