am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt...
am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '1549adb4':
BatteryStats: Fail gracefully on corrupt battery stats