erge branch 'master' into oauth2_utils_work_with_ee_hack

src/python/grpcio_observability/make_grpcio_observability.py

@@ -66,11 +66,7 @@ GRPCIO_OBSERVABILITY_ROOT_PREFIX = "src/python/grpcio_observability/"
 COPY_FILES_SOURCE_TARGET_PAIRS = [
     ("include", "grpc_root/include"),
     ("third_party/abseil-cpp/absl", "third_party/abseil-cpp/absl"),
-    ("src/core/lib", "grpc_root/src/core/lib"),
-    (
-        "src/core/load_balancing",
-        "grpc_root/src/core/load_balancing",
-    ),
+    ("src/core", "grpc_root/src/core"),
 ]
 
 # grpc repo root

tools/run_tests/artifacts/artifact_targets.py

@@ -152,6 +152,7 @@ class PythonArtifact:
             environ["PIP"] = "/opt/python/{}/bin/pip3".format(self.py_version)
             environ["GRPC_SKIP_PIP_CYTHON_UPGRADE"] = "TRUE"
             environ["GRPC_SKIP_TWINE_CHECK"] = "TRUE"
+            environ["LDFLAGS"] = "-s"
             return create_docker_jobspec(
                 self.name,
                 "tools/dockerfile/grpc_artifact_python_linux_{}".format(