Merge pull request #13921 from apolcyn/backport_distribtest_fix

Backport 13793 to 1.8.x