Merge "Fix crash for tether with quotes in SSID" into froyo