diff --git a/build.gradle b/build.gradle
index cd848b0198..495d353c84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,7 +61,7 @@ subprojects {
         protocPluginBaseName = 'protoc-gen-grpc-java'
         javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"
 
-        guavaVersion = '19.0'
+        guavaVersion = '20.0'
         protobufVersion = '3.1.0'
         protobufNanoVersion = '3.0.0-alpha-5'
 
diff --git a/core/src/main/java/io/grpc/internal/LogExceptionRunnable.java b/core/src/main/java/io/grpc/internal/LogExceptionRunnable.java
index 4f444e61ea..ee1dae4c2d 100644
--- a/core/src/main/java/io/grpc/internal/LogExceptionRunnable.java
+++ b/core/src/main/java/io/grpc/internal/LogExceptionRunnable.java
@@ -58,7 +58,7 @@ public final class LogExceptionRunnable implements Runnable {
       task.run();
     } catch (Throwable t) {
       log.log(Level.SEVERE, "Exception while executing runnable " + task, t);
-      Throwables.propagateIfPossible(t);
+      Throwables.throwIfUnchecked(t);
       throw new AssertionError(t);
     }
   }
diff --git a/core/src/main/java/io/grpc/internal/ServerCallImpl.java b/core/src/main/java/io/grpc/internal/ServerCallImpl.java
index 89bfcd36be..e295c08438 100644
--- a/core/src/main/java/io/grpc/internal/ServerCallImpl.java
+++ b/core/src/main/java/io/grpc/internal/ServerCallImpl.java
@@ -74,7 +74,7 @@ final class ServerCallImpl<ReqT, RespT> extends ServerCall<ReqT, RespT> {
   private Compressor compressor;
 
   ServerCallImpl(ServerStream stream, MethodDescriptor<ReqT, RespT> method,
-      Metadata inboundHeaders, Context.CancellableContext context, StatsTraceContext statsTraceCtx, 
+      Metadata inboundHeaders, Context.CancellableContext context, StatsTraceContext statsTraceCtx,
       DecompressorRegistry decompressorRegistry, CompressorRegistry compressorRegistry) {
     this.stream = stream;
     this.method = method;
@@ -249,7 +249,7 @@ final class ServerCallImpl<ReqT, RespT> extends ServerCall<ReqT, RespT> {
         } finally {
           if (t != null) {
             // TODO(carl-mastrangelo): Maybe log e here.
-            Throwables.propagateIfPossible(t);
+            Throwables.throwIfUnchecked(t);
             throw new RuntimeException(t);
           }
         }
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 3f2c924b97..19d9a1f520 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -53,7 +53,7 @@ protobuf {
 dependencies {
     compile 'com.android.support:appcompat-v7:22.1.1'
     compile 'com.google.code.findbugs:jsr305:3.0.0'
-    compile 'com.google.guava:guava:18.0'
+    compile 'com.google.guava:guava:20.0'
     compile 'com.squareup.okhttp:okhttp:2.2.0'
 
     // You need to build grpc-java to obtain these libraries below.
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
index 2f7810ffbe..ca6685ffb9 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -51,7 +51,7 @@ protobuf {
 dependencies {
     compile 'com.android.support:appcompat-v7:23.+'
     compile 'com.google.code.findbugs:jsr305:3.0.0'
-    compile 'com.google.guava:guava:18.0'
+    compile 'com.google.guava:guava:20.0'
     compile 'com.squareup.okhttp:okhttp:2.2.0'
 
     // You need to build grpc-java to obtain these libraries below.
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
index b6b54118f3..460e2cd3d6 100644
--- a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
+++ b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
@@ -1052,7 +1052,7 @@ public abstract class AbstractInteropTest {
 
     HostAndPort remoteAddress = HostAndPort.fromString(serverCallCapture.get().attributes()
             .get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR).toString());
-    assertEquals(expectedRemoteAddress, remoteAddress.getHostText());
+    assertEquals(expectedRemoteAddress, remoteAddress.getHost());
   }
 
   /** Helper for asserting TLS info in SSLSession {@link io.grpc.ServerCall#attributes()} */