am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev

* commit '7fb1655a891de275ab8a752294c42b9c13352af6':
  BatteryStats: Fail gracefully on corrupt battery stats