Merge "Improve DateUtilsTest."