Merge "services.net: Use the new ModuleNetworkStackClient" am: fdf46978ab

Change-Id: I97918b59b98a76267935680ceae19881f5f42e7b