Automated cherry pick of #160 on rel-v1.25: No scale down during rolling update#205

Merged

rishabh-11 merged 5 commits intogardener:rel-v1.25from himanshu-kun:automated-cherry-pick-of-#160-upstream-rel-v1.25

Apr 10, 2023

+84-45