v3007.9
Fix bad and unused import
Test fix
Merge branch '3006.x' into merge/3006.x/3007.x-25-11-18
Merge branch '3006.x' into merge/3006.x/3007.x-25-11-19
Fix broken backport 64229 form master to 3006.x
Pyupgrade and drop six
Merge forward 3006.x into 3007.x