Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Bazel: Remove deprecated tls_enabled option
Change-Id: I2806152042bd597c8a5bf2c61d15da7c203d7a20
diff --git a/tools/remote-bazelrc b/tools/remote-bazelrc
index b26a8e8..826be1d 100644
--- a/tools/remote-bazelrc
+++ b/tools/remote-bazelrc
@@ -70,9 +70,6 @@
# Enable remote execution so actions are performed on the remote systems.
build:remote --remote_executor=remotebuildexecution.googleapis.com
-# Enable encryption.
-build:remote --tls_enabled=true
-
# Set a higher timeout value, just in case.
build:remote --remote_timeout=3600
