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

Change-Id: I5c9b6f7ea680b151d6ba87007ddc6da34036e256