Merge change I409d9b4a into eclair-mr2

* changes:
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID