Merge "Restore ZoneInfo specific code in GregorianCalendar"