Merge "Partially fix GregorianCalendarTest."