Merge "Fix failure BatteryInfoTest after string is update"