Merge "Don't crash in batterystats"