Merge "Replace SSID String with WifiSsid"