Merge change 20930

* changes:
  BatteryService: Fix problems shutting down when the battery is dead: