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