Merge "Remove current-time-sensitive fields from ZoneInfoData"