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