Merge "Fix lint errors for moving IpClient to NetworkStack"