Merge "Add the NetworkScanRequestTracker"