Merge "Remove flakyTest annotation on tests." into tm-dev