diff --git a/gcloud-java-gax/pom.xml b/gcloud-java-gax/pom.xml
index 83bd92f49f3e..bbfd8c6007e5 100644
--- a/gcloud-java-gax/pom.xml
+++ b/gcloud-java-gax/pom.xml
@@ -27,6 +27,11 @@
       <artifactId>auto-value</artifactId>
       <version>1.1</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.1</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java b/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java
index c1a000d438a2..a20c2b6a1f10 100644
--- a/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java
+++ b/gcloud-java-gax/src/main/java/io/gapi/gax/protobuf/PathTemplate.java
@@ -11,6 +11,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -766,7 +767,7 @@ private static ImmutableList<Segment> parseTemplate(String template) {
 
   private static String encodeUrl(String text) {
     try {
-      return URLEncoder.encode(text, "UTF-8");
+      return URLEncoder.encode(text, StandardCharsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new ValidationException("UTF-8 encoding is not supported on this platform");
     }
@@ -774,7 +775,7 @@ private static String encodeUrl(String text) {
 
   private static String decodeUrl(String url) {
     try {
-      return URLDecoder.decode(url, "UTF-8");
+      return URLDecoder.decode(url, StandardCharsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new ValidationException("UTF-8 encoding is not supported on this platform");
     }