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

* commit '1ad61b3314b1ea3a99d804ec9a89caae25636897':
  BatteryStats: Fail gracefully on corrupt battery stats