am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev

* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
  Fix issue #17705755: Battery stats resets at incorrect times