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

Change-Id: Ic865134a7e8ccfa11585c200a6cde5b5e3e7431f