Merge "Fix flaky test."