Merge "Remove flaky test until migration." into tm-dev