Merge "Update to follow BatteryStats."