Merge "Fix failed test case for BatteryInfoTest"