Merge "WifiNetworkSuggestion: String changes for UI control"