Merge "Improvements to battery stats."