Merge change 26328 into eclair

* changes:
  Fix the issue of 'Wifi framework is not aware of state change'