Merge "Fix a few small battery stats problems:" into gingerbread