Merge "Fix lint errors for moving IpClient to NetworkStack" am: 9325fbc4f8 am: 3d7914e98b
am: cd2dc71a8a

Change-Id: Iea48be6bcfca67cf702b2bb3f4b0ed5f44ec40eb