Merge "Fix BatteryInfo test case failures"