Commits b26436c: release-v1.7.x: cherry-pick AWS SDK client timeout fixes (#9318, #9320) (#9333) (Derek Frank) #9333