am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev

* commit '87a79c394dcecd28c3811615ce975abcde185255':
  BatteryStatsHelper: Fix some lost power