Merge "Fix TextClockTest flakiness."