Merge "Timing: Fix flaky TimingTest test"