Merge "BatteryStats: Remove dead code."