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

* commit '8197e2de06bb96b0076469528a44b36a080ec9e1':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary