Merge "Fix crash in BatteryUtils"