Merge "DateIntervalFormatTest: Move 2017-2018 timestamps to 2006-2007."