[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: c2c8e592 -s ours
am skip reason: Change-Id I1015e7893ba6af74876665826960e8fcc1711476 with SHA-1 81542c5c is in history
Change-Id: I26da82a38d8c6cf3327862c4db67bdda0fb6123b