Merge branch 'main' into PR #1889 to update

Author: lqiu96

.github/CODEOWNERS

@@ -5,14 +5,14 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 # The @googleapis/api-pubsublite is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/api-pubsublite
+*                       @googleapis/cloud-sdk-java-team @googleapis/api-pubsublite
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/yoshi-java @googleapis/api-pubsublite
+**/*.java               @googleapis/cloud-sdk-java-team @googleapis/api-pubsublite
 
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
 
 # Generated snippets should not be owned by samples reviewers
-samples/snippets/generated/       @googleapis/yoshi-java
+samples/snippets/generated/       @googleapis/cloud-sdk-java-team