Merge change 24805 into eclair

* changes:
  Don't init wifiChannels until after supplicant up