[automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 -s ours am: d98059ce5c -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 230178c6af is in history
Change-Id: I8291a6eed51fd239abf7f82c4f0f6bd9dda6e4b2
This commit is contained in: