DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77  -s ours am: 888916ff0f  -s ours
am: 29db6ccb72  -s ours

* commit '29db6ccb72b1b43568f2045825cf5435bd661e00':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing