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

Change-Id: I00fa049ebd7c1b68a4ef0a9c1d8f00e1f2dd906f