Merge "Flaky test fix." into tm-dev