Merge "Fixes to battery stats debug output." into gingerbread