Merge "Add IIpClient API for IpClient" am: 60b9ad2ec3
am: e89f53330a

Change-Id: I58d8725a1f43f42d364a53ca80d86e3f65e6cf63