Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev