Merge pull request #17439 from seamuslee001/karma_upgrade_162020