Merge change 25938 into eclair

* changes:
  Don't require WAKE_LOCK permission to enable wifi