Merge "Following renaming of battery stats."