Merge "Replace NetworkQueryService with NetworkScanHelper"