Merge "Remove IpClient wrapper"
am: 427f0c36d5

Change-Id: Ia1dfa96b2e929d2481519147dea7f5375aebd53c