am 67ee88e8: am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev

* commit '67ee88e8ad19f0dc67add174903f24a7c479e74f':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary