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

Change-Id: Ic77f0af05fe094485ce78fd44c2f2d009a257164