[automerger skipped] Merge "Support losing the upstream in IpServerTest." into...

[automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b -s ours am: 515453da -s ours am: fb1db9b2 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 484d0e1a is in history

Change-Id: I547216283f1d2d765548db71b35fdad26783da35