Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev