am: 6902052c -s ours * commit '6902052c': DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing