diff --git a/build.gradle b/build.gradle
index 82820a90ad..c3263d63a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,7 +182,7 @@ subprojects {
             epoll_suffix = ":" + osdetector.classifier
         }
         libraries = [
-                errorprone: "com.google.errorprone:error_prone_annotations:2.0.19",
+                errorprone: "com.google.errorprone:error_prone_annotations:2.1.2",
                 guava: "com.google.guava:guava:${guavaVersion}",
                 hpack: 'com.twitter:hpack:0.10.1',
                 jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
@@ -191,9 +191,10 @@ subprojects {
                 google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.9.0',
                 okhttp: 'com.squareup.okhttp:okhttp:2.5.0',
                 okio: 'com.squareup.okio:okio:1.13.0',
-                opencensus_api: 'io.opencensus:opencensus-api:0.8.0',
-                opencensus_contrib_grpc_metrics: 'io.opencensus:opencensus-contrib-grpc-metrics:0.8.0',
-                opencensus_impl: 'io.opencensus:opencensus-impl:0.8.0',
+                opencensus_api: 'io.opencensus:opencensus-api:0.10.0',
+                opencensus_contrib_grpc_metrics: 'io.opencensus:opencensus-contrib-grpc-metrics:0.10.0',
+                opencensus_impl: 'io.opencensus:opencensus-impl:0.10.0',
+                opencensus_impl_lite: 'io.opencensus:opencensus-impl-lite:0.10.0',
                 instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
                 protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
                 protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
diff --git a/gae-interop-testing/gae-jdk7/build.gradle b/gae-interop-testing/gae-jdk7/build.gradle
index 902eece88e..1047f4f4d8 100644
--- a/gae-interop-testing/gae-jdk7/build.gradle
+++ b/gae-interop-testing/gae-jdk7/build.gradle
@@ -45,7 +45,11 @@ dependencies {
   compile project(":grpc-okhttp")
   compile project(":grpc-protobuf")
   compile project(":grpc-stub")
-  compile project(":grpc-interop-testing")
+  compile (project(":grpc-interop-testing")) {
+    exclude group: 'io.opencensus', module: 'opencensus-impl'
+  }
+  // The lite version of opencensus is required for jdk7 GAE
+  runtime libraries.opencensus_impl_lite
 }
 
 // [START model]
diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
index 41ffc0e1ce..068ab0e87b 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
@@ -120,12 +120,6 @@ public class OkHttpChannelBuilder extends
 
   private OkHttpChannelBuilder(String target) {
     super(target);
-    // TODO(zpencer): re-enable after census issue is resolved
-    // census-instrumentation/opencensus-java/issues/777
-    if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
-      setTracingEnabled(false);
-      setStatsEnabled(false);
-    }
   }
 
   @VisibleForTesting