Merge "Fix some TimerTest flakiness."