Merge "Integrate testNetworkService and Manager with Connectivity stack"