[automerger skipped] Merge "Make IpClientIntegrationTest pass on rvc-dev."...
[automerger skipped] Merge "Make IpClientIntegrationTest pass on rvc-dev." into rvc-dev am: 5d74a29e -s ours
am skip reason: Change-Id I1015e7893ba6af74876665826960e8fcc1711476 with SHA-1 097a6d2e is in history
Change-Id: Icd3b20fb1eeb9e84577a173f090534c551f56feb