Merge "Some improvements to battery stats data."