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

Change-Id: Ic241e4f7d0356910fe47e8c4b9fbc694270836d0