Merge "Migration of ZoneInfo to 64-bit times from 32-bit"