Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev am: 1d6d4c5a69 am: d5808d0d35
am: 72c1a0a110  -s ours

* commit '72c1a0a110fc1e5af1dce8f00cf114e7a6ea32b8':
  DO NOT MERGE: Fix batterystats battery level int packing