Merge "DateIntervalFormatTest: Move 2017-2018 timestamps to 2006-2007." am: 80ef7bc460
am: a28edf5ef6

Change-Id: I479e28e9ec6a66fa04440683331f86ab3a3ae548