Merge "Revert "Disable highly flakey test blocking 2206 runs every week."" into tm-dev