diff --git a/WORKSPACE b/WORKSPACE
index 6933ecda0..05f5e291d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -26,7 +26,7 @@
 #
 # A Bazel (http://bazel.io) workspace for the Google Cloud Endpoints runtime.
 
-ISTIO_PROXY = "cea882799327dbea20ce849be36088a349a35f18"
+ISTIO_PROXY = "2c9c1af3d6ac5ab4d295444c30acd42599edfcb3"
 
 git_repository(
     name = "nginx",
diff --git a/src/nginx/t/ServiceControl.pm b/src/nginx/t/ServiceControl.pm
index c3d531883..333ca0666 100644
--- a/src/nginx/t/ServiceControl.pm
+++ b/src/nginx/t/ServiceControl.pm
@@ -66,8 +66,8 @@ sub gen_metric_int64 {
 }
 
 my %time_distribution = (
-  buckets => 8,
-  growth => 10.0,
+  buckets => 29,
+  growth => 2.0,
   scale => 1e-6
 );
 
diff --git a/tools/src/utils/service_control.go b/tools/src/utils/service_control.go
index bbfdd4606..51a36dd90 100644
--- a/tools/src/utils/service_control.go
+++ b/tools/src/utils/service_control.go
@@ -80,7 +80,7 @@ type distOptions struct {
 }
 
 var (
-	timeDistOptions = distOptions{8, 10.0, 1e-6}
+	timeDistOptions = distOptions{29, 2.0, 1e-6}
 	sizeDistOptions = distOptions{8, 10.0, 1}
 	randomMatrics   = map[string]bool{
 		"serviceruntime.googleapis.com/api/consumer/total_latencies":            true,