Merge change 9054

* changes:
  Increase waiting time for data disable action in setPowerStateToDesired().