diff --git a/.bazelrc b/.bazelrc
index 9f4842ca86..641333e982 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -52,6 +52,9 @@ build:asan-dev --copt -fsanitize=address
 build:asan-dev --linkopt -fsanitize=address
 build:asan-dev --platform_suffix=-asan
 
+build:clang-asan --linkopt --rtlib=compiler-rt
+build:clang-asan --linkopt --unwindlib=libgcc
+
 # Locally-runnable TSAN config
 build:tsan-dev --features=tsan
 build:tsan-dev --copt -fsanitize=thread
diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl
index c34e0cc5c3..8b4795610f 100644
--- a/bazel/envoy_mobile_repositories.bzl
+++ b/bazel/envoy_mobile_repositories.bzl
@@ -31,10 +31,10 @@ def upstream_envoy_overrides():
     http_archive(
         name = "com_google_absl",
         patches = ["@envoy_mobile//bazel:abseil.patch"],
-        sha256 = "635367c5cac4bbab95d0485ba9e68fa422546b06ce050190c99be7e23aba3ce3",
-        strip_prefix = "abseil-cpp-8f1c34a77a2ba04512b7f9cbc6013d405e6a0b31",
-        # 2020-08-08
-        urls = ["https://github.com/abseil/abseil-cpp/archive/8f1c34a77a2ba04512b7f9cbc6013d405e6a0b31.tar.gz"],
+        sha256 = "2e4ace2ed32a4ccfd29e856ad72b4fd1eae2ec060d3ba8646857fa170d6e8269",
+        strip_prefix = "abseil-cpp-17c954d90d5661e27db8fc5f086085690a8372d9",
+        # 2021-06-03
+        urls = ["https://github.com/abseil/abseil-cpp/archive/17c954d90d5661e27db8fc5f086085690a8372d9.tar.gz"],
     )
 
     # This should be kept in sync with Envoy itself, we just need to apply this patch
diff --git a/envoy b/envoy
index 57bfbda2a5..a82962cebd 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 57bfbda2a50d2f026cf64c82383fe3bebe1e0860
+Subproject commit a82962cebd26d04637284e9b04e6f32ad49cbe12