Merge pull request #1318 from kmala/automated-cherry-pick-of-#1153-#1161-#1215-#1217-#1214-upstream-release-1.31 · kubernetes/cloud-provider-aws@c70e4ac