Merge "Add TEST_NETWORK_SERVICE to module API" into sc-dev