Merge "Support losing the upstream in IpServerTest." am: 8a656211 am: fc63250a am: abc53a51 am: 774c2da1 am: ba39049e Change-Id: I2c3d397ac8327a7776e16b8cc82aca1898a65bf2