Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev