Merge "MergeHistory: Fix flaky test due to relative timestamp"