Merge remote-tracking branch 'upstream/master' into diregapic-lro

Author: vam-google

rules_java_gapic/java_gapic_pkg.bzl

@@ -351,7 +351,7 @@ def java_gapic_assembly_gradle_pkg(
         grpc_target_dep = ["%s" % grpc_target]
 
     if client_deps:
-        if not transport or transport == "rest":
+        if not transport or transport == "grpc":
             template_label = Label("//rules_java_gapic:resources/gradle/client_grpc.gradle.tmpl")
         elif transport == "rest":
             template_label = Label("//rules_java_gapic:resources/gradle/client_rest.gradle.tmpl")