Merge "Fix flakiness in DateIntervalFormatTest." into klp-dev