Merge "Fix GregorianCalendarTest#test_addII."