Fix #19063
Merge pull request #19068 from cachedout/fix_cloud_cli

Fix #19063