Automatic merge from submit-queue Using BetaStorageClassAnnotation to avoid hardcode **Release note**: ```release-note NONE ```
Automatic merge from submit-queue Using BetaStorageClassAnnotation to avoid hardcode **Release note**: ```release-note NONE ```