diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index c12bcb84a..5a383cc73 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "3a2512d923e2eee1fce9f4f6a23cf93f2e7ed93f"  # March 1st, 2020
-ENVOY_SHA = "6a643ae3141762c403aa031cc19e65c441759785fd7dda51dcf5ad5f149283d0"
+ENVOY_COMMIT = "9be85fbc561c373875a0102dddf9baf5a86543c1"  # March 10th, 2020
+ENVOY_SHA = "111e34dd9f97700d6030dbac7fc826cb7c5fe4a1cccef3cc05c83508c84c6692"
 
 RULES_PYTHON_COMMIT = "dd7f9c5f01bafbfea08c44092b6b0c8fc8fcb77f"  # Feb 22nd, 2020
 RULES_PYTHON_SHA = "0aa9ec790a58053e3ab5af397879b267a625955f8297c239b2d8559c6773397b"
diff --git a/source/client/BUILD b/source/client/BUILD
index 4ae1e0cb8..b3235b9e1 100644
--- a/source/client/BUILD
+++ b/source/client/BUILD
@@ -52,6 +52,7 @@ envoy_cc_library(
         "@envoy//source/common/config:utility_lib_with_external_headers",
         "@envoy//source/common/event:dispatcher_includes_with_external_headers",
         "@envoy//source/common/event:real_time_system_lib_with_external_headers",
+        "@envoy//source/common/grpc:context_lib_with_external_headers",
         "@envoy//source/common/http:context_lib_with_external_headers",
         "@envoy//source/common/http:header_map_lib_with_external_headers",
         "@envoy//source/common/http:headers_lib_with_external_headers",
diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc
index a5da471a3..a4aeb9684 100644
--- a/source/client/process_impl.cc
+++ b/source/client/process_impl.cc
@@ -108,6 +108,7 @@ ProcessImpl::ProcessImpl(const Options& options, Envoy::Event::TimeSystem& time_
           {}, Envoy::Network::Utility::getLocalAddress(Envoy::Network::Address::IpVersion::v4),
           "nighthawk_service_zone", "nighthawk_service_cluster", "nighthawk_service_node")),
       secret_manager_(config_tracker_), http_context_(store_root_.symbolTable()),
+      grpc_context_(store_root_.symbolTable()),
       singleton_manager_(std::make_unique<Envoy::Singleton::ManagerImpl>(api_->threadFactory())),
       access_log_manager_(std::chrono::milliseconds(1000), *api_, *dispatcher_, access_log_lock_,
                           store_root_),
@@ -426,8 +427,8 @@ bool ProcessImpl::run(OutputCollector& collector) {
   cluster_manager_factory_ = std::make_unique<ClusterManagerFactory>(
       admin_, Envoy::Runtime::LoaderSingleton::get(), store_root_, tls_, generator_,
       dispatcher_->createDnsResolver({}, false), *ssl_context_manager_, *dispatcher_, *local_info_,
-      secret_manager_, validation_context_, *api_, http_context_, access_log_manager_,
-      *singleton_manager_);
+      secret_manager_, validation_context_, *api_, http_context_, grpc_context_,
+      access_log_manager_, *singleton_manager_);
   cluster_manager_factory_->setConnectionReuseStrategy(
       options_.h1ConnectionReuseStrategy() == nighthawk::client::H1ConnectionReuseStrategy::LRU
           ? Http1PoolImpl::ConnectionReuseStrategy::LRU
diff --git a/source/client/process_impl.h b/source/client/process_impl.h
index dfba53f6a..9d0420990 100644
--- a/source/client/process_impl.h
+++ b/source/client/process_impl.h
@@ -17,6 +17,7 @@
 #include "external/envoy/source/common/access_log/access_log_manager_impl.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/event/real_time_system.h"
+#include "external/envoy/source/common/grpc/context_impl.h"
 #include "external/envoy/source/common/http/context_impl.h"
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 #include "external/envoy/source/common/secret/secret_manager_impl.h"
@@ -114,6 +115,7 @@ class ProcessImpl : public Process, public Envoy::Logger::Loggable<Envoy::Logger
   Envoy::Server::ConfigTrackerImpl config_tracker_;
   Envoy::Secret::SecretManagerImpl secret_manager_;
   Envoy::Http::ContextImpl http_context_;
+  Envoy::Grpc::ContextImpl grpc_context_;
   Envoy::Thread::MutexBasicLockable access_log_lock_;
   Envoy::Singleton::ManagerPtr singleton_manager_;
   Envoy::AccessLog::AccessLogManagerImpl access_log_manager_;
diff --git a/test/output_formatter_test.cc b/test/output_formatter_test.cc
index 71d85b4b4..4878c9b89 100644
--- a/test/output_formatter_test.cc
+++ b/test/output_formatter_test.cc
@@ -122,7 +122,7 @@ TEST_F(OutputCollectorTest, DottedFormatter) {
                         "test/test_data/output_formatter.dotted.gold");
 }
 
-TEST_F(OutputCollectorTest, getLowerCaseOutputFormats) {
+TEST_F(OutputCollectorTest, GetLowerCaseOutputFormats) {
   auto output_formats = OutputFormatterImpl::getLowerCaseOutputFormats();
   // When you're looking at this code you probably just added an output format.
   // This is to point out that you might want to update the list below and add a test above.
diff --git a/test/utility_test.cc b/test/utility_test.cc
index f8058fa58..7246c6191 100644
--- a/test/utility_test.cc
+++ b/test/utility_test.cc
@@ -149,7 +149,7 @@ TEST_P(UtilityAddressResolutionTest, ResolveTwiceReturnsCached) {
             u.resolve(*dispatcher, address_family).get());
 }
 
-TEST_F(UtilityTest, translateAddressFamilyGoodValues) {
+TEST_F(UtilityTest, TranslateAddressFamilyGoodValues) {
   EXPECT_EQ(Envoy::Network::DnsLookupFamily::V6Only,
             Utility::translateFamilyOptionString(
                 nighthawk::client::AddressFamily_AddressFamilyOptions_V6));
@@ -161,7 +161,7 @@ TEST_F(UtilityTest, translateAddressFamilyGoodValues) {
                 nighthawk::client::AddressFamily_AddressFamilyOptions_AUTO));
 }
 
-TEST_F(UtilityTest, mapCountersFromStore) {
+TEST_F(UtilityTest, MapCountersFromStore) {
   Envoy::Stats::IsolatedStoreImpl store;
   store.counter("foo").inc();
   store.counter("worker.2.bar").inc();