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

* commit '30854356ef263a4e4ac3bd2376886f272d768e72':
  Fix issue #17705755: Battery stats resets at incorrect times