diff --git a/WORKSPACE b/WORKSPACE
index 096e2bba4e8..ba7bd45cec5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -30,7 +30,7 @@ bind(
 )
 
 # When updating envoy sha manually please update the sha in istio.deps file also
-ENVOY_SHA = "f936fc60f488cfae07f5e5d20d7381f0f23482fe"
+ENVOY_SHA = "23e8e12fd77b08b87007a819b5683a5289883b46"
 
 http_archive(
     name = "envoy",
diff --git a/istio.deps b/istio.deps
index bc75cfc353b..bfed023fac9 100644
--- a/istio.deps
+++ b/istio.deps
@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "f936fc60f488cfae07f5e5d20d7381f0f23482fe"
+		"lastStableSHA": "23e8e12fd77b08b87007a819b5683a5289883b46"
 	}
 ]
diff --git a/src/envoy/http/mixer/control.cc b/src/envoy/http/mixer/control.cc
index 53d7c6f8c6e..50658b99eaf 100644
--- a/src/envoy/http/mixer/control.cc
+++ b/src/envoy/http/mixer/control.cc
@@ -30,9 +30,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm,
                  const LocalInfo::LocalInfo& local_info)
     : config_(config),
       check_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.check_cluster(), cm, scope, dispatcher.timeSource())),
+          config_.check_cluster(), cm, scope, dispatcher.timeSystem())),
       report_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.report_cluster(), cm, scope, dispatcher.timeSource())),
+          config_.report_cluster(), cm, scope, dispatcher.timeSystem())),
       stats_obj_(dispatcher, stats,
                  config_.config_pb().transport().stats_update_interval(),
                  [this](::istio::mixerclient::Statistics* stat) -> bool {
diff --git a/src/envoy/tcp/mixer/control.cc b/src/envoy/tcp/mixer/control.cc
index 85789069ec7..c00af8f7b96 100644
--- a/src/envoy/tcp/mixer/control.cc
+++ b/src/envoy/tcp/mixer/control.cc
@@ -33,9 +33,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm,
     : config_(config),
       dispatcher_(dispatcher),
       check_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.check_cluster(), cm, scope, dispatcher.timeSource())),
+          config_.check_cluster(), cm, scope, dispatcher.timeSystem())),
       report_client_factory_(Utils::GrpcClientFactoryForCluster(
-          config_.report_cluster(), cm, scope, dispatcher.timeSource())),
+          config_.report_cluster(), cm, scope, dispatcher.timeSystem())),
       stats_obj_(dispatcher, stats,
                  config_.config_pb().transport().stats_update_interval(),
                  [this](Statistics* stat) -> bool { return GetStats(stat); }),