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

* commit '888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing