Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"