Merge "Fix NetworkScanApiTest#testRequestNetworkScan"