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

Change-Id: Icbbbd2c5db729210735c0bcb415b9c4025d852e0