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

Merge commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0'

* commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0':
  Fix a few small battery stats problems: