Merge change 1881 into donut

* changes:
  WifiService: Wifi power management change