Merge "Add a simple test for NetworkManagementService." into klp-dev