Merge change 24870 into eclair

* changes:
  Transient patch for the WifiConfiguration change.