Merge "Small fixes to battery stats." into gingerbread