Merge pull request #2391 from k8s-infra-cherrypick-robot/cherry-pick-… · kubernetes-sigs/azurefile-csi-driver@505cd34