saad-ali: Automated cherry pick of #86346 #88684 #89319 upstream release 1.17

No Results