Merge pull request #19388 from jdavcs/dev_sa20_cleanup #31122

Job	Run time
build-client / build-client	9m 47s
setup-selenium / setup_chromedriver	4s
Test (3.8, 0)	41m 21s
Test (3.8, 1)	49m 58s
Test (3.8, 2)	47m 24s
	2h 28m 34s

Provide feedback