diff --git a/third_party/BUILD b/third_party/BUILD
index b9af326f493023..19a221fc400acd 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -321,20 +321,27 @@ java_import(
     srcjar = "hungarian_algorithm/software-and-algorithms-1.0-src.jar",
 )
 
+java_import(
+    name = "threeten",
+    jars = [
+        "error_prone/threeten-extra-1.5.0.jar",
+    ],
+)
+
 java_import(
     name = "error_prone_annotations",
     jars = [
-        "error_prone/error_prone_annotations-2.3.4.jar",
-        "error_prone/error_prone_type_annotations-2.3.4.jar",
+        "error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar",
+        "error_prone/error_prone_type_annotations-2.3.5-SNAPSHOT.jar",
     ],
 )
 
 java_import(
     name = "error_prone",
     jars = [
-        "error_prone/error_prone_annotation-2.3.4.jar",
-        "error_prone/error_prone_check_api-2.3.4.jar",
-        "error_prone/error_prone_core-2.3.4.jar",
+        "error_prone/error_prone_annotation-2.3.5-SNAPSHOT.jar",
+        "error_prone/error_prone_check_api-2.3.5-SNAPSHOT.jar",
+        "error_prone/error_prone_core-2.3.5-SNAPSHOT.jar",
     ],
     exports = [
         ":error_prone_annotations",
@@ -347,6 +354,7 @@ java_import(
         ":jcip_annotations",
         ":jsr305",
         ":pcollections",
+        ":threeten",
         "//third_party/checker_framework_dataflow",
         "//third_party/jformatstring",
     ],
@@ -377,7 +385,8 @@ java_import(
 filegroup(
     name = "bootstrap_guava_and_error_prone-jars",
     srcs = [
-        "error_prone/error_prone_annotations-2.3.4.jar",
+        "error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar",
+        "error_prone/threeten-extra-1.5.0.jar",
         "guava/guava-25.1-jre.jar",
         "jcip_annotations/jcip-annotations-1.0-1.jar",
         "jsr305/jsr-305.jar",
diff --git a/third_party/checker_framework_dataflow/BUILD b/third_party/checker_framework_dataflow/BUILD
index e0784b07c756a6..86db8280dce9d2 100644
--- a/third_party/checker_framework_dataflow/BUILD
+++ b/third_party/checker_framework_dataflow/BUILD
@@ -11,8 +11,8 @@ filegroup(
 
 java_import(
     name = "checker_framework_dataflow",
-    jars = ["dataflow-3.2.0.jar"],
-    srcjar = "dataflow-3.2.0-sources.jar",
+    jars = ["dataflow-shaded-3.1.2.jar"],
+    srcjar = "dataflow-shaded-3.1.2-sources.jar",
     deps = [
         "//third_party/checker_framework_javacutil",
     ],
@@ -20,5 +20,5 @@ java_import(
 
 filegroup(
     name = "bootstrap",
-    srcs = ["dataflow-3.2.0.jar"],
+    srcs = ["dataflow-shaded-3.1.2.jar"],
 )
diff --git a/third_party/checker_framework_dataflow/dataflow-3.2.0.jar b/third_party/checker_framework_dataflow/dataflow-3.2.0.jar
deleted file mode 100644
index 32ba7b0fc10296..00000000000000
Binary files a/third_party/checker_framework_dataflow/dataflow-3.2.0.jar and /dev/null differ
diff --git a/third_party/checker_framework_dataflow/dataflow-3.2.0-sources.jar b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2-sources.jar
similarity index 67%
rename from third_party/checker_framework_dataflow/dataflow-3.2.0-sources.jar
rename to third_party/checker_framework_dataflow/dataflow-shaded-3.1.2-sources.jar
index 7be9f5468a1157..8ede650e646036 100644
Binary files a/third_party/checker_framework_dataflow/dataflow-3.2.0-sources.jar and b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2-sources.jar differ
diff --git a/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2.jar b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2.jar
new file mode 100644
index 00000000000000..ca0008b042fc06
Binary files /dev/null and b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2.jar differ
diff --git a/third_party/error_prone/error_prone_annotation-2.3.4.jar b/third_party/error_prone/error_prone_annotation-2.3.4.jar
deleted file mode 100644
index dbd21fe14d7791..00000000000000
Binary files a/third_party/error_prone/error_prone_annotation-2.3.4.jar and /dev/null differ
diff --git a/third_party/error_prone/error_prone_annotation-2.3.5-SNAPSHOT.jar b/third_party/error_prone/error_prone_annotation-2.3.5-SNAPSHOT.jar
new file mode 100644
index 00000000000000..2e0b9f1b88e1e6
Binary files /dev/null and b/third_party/error_prone/error_prone_annotation-2.3.5-SNAPSHOT.jar differ
diff --git a/third_party/error_prone/error_prone_annotations-2.3.4.jar b/third_party/error_prone/error_prone_annotations-2.3.4.jar
deleted file mode 100644
index c9bea2abc4e3ef..00000000000000
Binary files a/third_party/error_prone/error_prone_annotations-2.3.4.jar and /dev/null differ
diff --git a/third_party/error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar b/third_party/error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar
new file mode 100644
index 00000000000000..e98bab4424e032
Binary files /dev/null and b/third_party/error_prone/error_prone_annotations-2.3.5-SNAPSHOT.jar differ
diff --git a/third_party/error_prone/error_prone_check_api-2.3.4.jar b/third_party/error_prone/error_prone_check_api-2.3.4.jar
deleted file mode 100644
index 55045398ead673..00000000000000
Binary files a/third_party/error_prone/error_prone_check_api-2.3.4.jar and /dev/null differ
diff --git a/third_party/error_prone/error_prone_check_api-2.3.5-SNAPSHOT.jar b/third_party/error_prone/error_prone_check_api-2.3.5-SNAPSHOT.jar
new file mode 100644
index 00000000000000..6a0397ff93ff4e
Binary files /dev/null and b/third_party/error_prone/error_prone_check_api-2.3.5-SNAPSHOT.jar differ
diff --git a/third_party/error_prone/error_prone_core-2.3.4.jar b/third_party/error_prone/error_prone_core-2.3.4.jar
deleted file mode 100644
index 27c6e23f714b5a..00000000000000
Binary files a/third_party/error_prone/error_prone_core-2.3.4.jar and /dev/null differ
diff --git a/third_party/error_prone/error_prone_core-2.3.5-SNAPSHOT.jar b/third_party/error_prone/error_prone_core-2.3.5-SNAPSHOT.jar
new file mode 100644
index 00000000000000..b85af1ee7d2e0a
Binary files /dev/null and b/third_party/error_prone/error_prone_core-2.3.5-SNAPSHOT.jar differ
diff --git a/third_party/error_prone/error_prone_type_annotations-2.3.5-SNAPSHOT.jar b/third_party/error_prone/error_prone_type_annotations-2.3.5-SNAPSHOT.jar
new file mode 100644
index 00000000000000..6f22ae060a3f03
Binary files /dev/null and b/third_party/error_prone/error_prone_type_annotations-2.3.5-SNAPSHOT.jar differ
diff --git a/third_party/error_prone/threeten-extra-1.5.0.jar b/third_party/error_prone/threeten-extra-1.5.0.jar
new file mode 100644
index 00000000000000..45f8c3d8d5a818
Binary files /dev/null and b/third_party/error_prone/threeten-extra-1.5.0.jar differ