Merge "Move NetworkStack to services.net"