Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev