Merge "OldDateFormatTest is flaky; improve its output."