Merge "NetworkControllerWifiTest: Fix unit test" into sc-dev