Automated cherry pick of #20840#21572

pjsharath28 wants to merge 1 commit intoetcd-io:release-3.6etcd-io/etcd:release-3.6from

pjsharath28:automated-cherry-pick-of-#20840-upstream-release-3.6pjsharath28/etcd:automated-cherry-pick-of-#20840-upstream-release-3.6Copy head branch name to clipboard