Merge "Change update-tzdata.py to update ICU data as well"