Merge "Fix BatteryInfo test fail" into sc-dev