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