Merge change 24646 into eclair

* changes:
  Aggregate the security settings for WiFi network configuration.