Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev