am 9a1034aa: am 6b7b4845: Various improvements to battery stats collection

Merge commit '9a1034aa9746b94ecb659ea849765a160bdf747e'

* commit '9a1034aa9746b94ecb659ea849765a160bdf747e':
  Various improvements to battery stats collection