Merge "Qualify references to WifiNetworkSuggestions"