Merge "WifiNetworkSpecifierTest: Convert to junit4" into rvc-dev