diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index d53634fcb..b51906be0 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -72,6 +72,7 @@ dependencies {
   compile deps['com.google.auth:google-auth-library-credentials']
   compile deps['com.google.auth:google-auth-library-oauth2-http']
   compile deps['com.google.auto.value:auto-value-annotations']
+  compile deps['com.google.common.html.types:types']
   compile deps['com.google.cloud:google-cloud-core']
   compile deps['com.google.cloud:google-cloud-storage']
   compile deps['com.google.guava:guava']
diff --git a/core/build.gradle b/core/build.gradle
index 62f95fbd6..e258c05d6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -330,7 +330,6 @@ dependencies {
   testCompile deps['org.junit.platform:junit-platform-suite-api']
   testCompile deps['org.mockito:mockito-core']
   testCompile deps['org.mockito:mockito-junit-jupiter']
-  testCompile 'org.checkerframework:checker-qual:3.9.1'
   runtime deps['org.postgresql:postgresql']
 
   // Indirect dependency found by undeclared-dependency check. Such
diff --git a/dependencies.gradle b/dependencies.gradle
index c2e32f4d9..d91003603 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -51,6 +51,7 @@ ext {
       'com.google.auto.service:auto-service:1.0-rc7',
       'com.google.auto.value:auto-value-annotations:1.7.4',
       'com.google.auto.value:auto-value:1.7.4',
+      'com.google.common.html.types:types:1.0.6',
       'com.google.closure-stylesheets:closure-stylesheets:1.5.0',
       // The two below are needed only for Datastore bulk delete pipeline.
       'com.google.cloud.bigdataoss:util:2.1.3',