Merge changes I1250730c,I7d00848c

* changes:
  Create a wrapper for IpClient
  Move IpClient to NetworkStack