Merge "Adjust for DST properly in GregorianCalendar.add(int,int)."