
Automatic merge from submit-queue (batch tested with PRs 42106, 42094, 42069, 42098, 41852) Write etcd_upgrade test. Part of the fix for #40636
Automatic merge from submit-queue (batch tested with PRs 42106, 42094, 42069, 42098, 41852) Write etcd_upgrade test. Part of the fix for #40636