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