Merge branch 'main' into dl/remove-vertexai-import

Merge branch 'main' into dl/remove-vertexai-import #21637