diff --git a/Android.bp b/Android.bp
index fdab3bf..b916f20 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,7 +36,7 @@
     name: "error_prone_annotations",
     host_supported: true,
     visibility: ["//visibility:public"],
-    jars: ["error_prone/error_prone_annotations-2.32.0.jar"],
+    jars: ["error_prone/error_prone_annotations-2.36.0.jar"],
     min_sdk_version: "29",
     apex_available: [
         "//apex_available:anyapex",
@@ -53,8 +53,8 @@
     name: "error_prone_core_jars",
     host_supported: true,
     jars: [
-        "error_prone/error_prone_core-2.32.0-with-dependencies.jar",
-        "error_prone/error_prone_annotations-2.32.0.jar",
+        "error_prone/error_prone_core-2.36.0-with-dependencies.jar",
+        "error_prone/error_prone_annotations-2.36.0.jar",
     ],
 }
 
@@ -75,7 +75,7 @@
     host_supported: true,
     visibility: ["//visibility:public"],
     jars: [
-        "error_prone/error_prone_test_helpers-2.32.0.jar",
+        "error_prone/error_prone_test_helpers-2.36.0.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index 417b07c..7d90205 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -18,5 +18,5 @@
     value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar"
   }
   version: "3.39.0"
-  last_upgrade_date { year: 2024 month: 9 day: 27}
+  last_upgrade_date { year: 2024 month: 12 day: 2}
 }
diff --git a/error_prone/METADATA b/error_prone/METADATA
index c8235ef..ea757f1 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -10,8 +10,8 @@
   }
   url {
     type: ARCHIVE
-    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.32.0/error_prone_core-2.32.0-with-dependencies.jar"
+    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.36.0/error_prone_core-2.36.0-with-dependencies.jar"
   }
-  version: "2.32.0"
-  last_upgrade_date { year: 2024 month: 9 day: 27}
+  version: "2.36.0"
+  last_upgrade_date { year: 2024 month: 12 day: 2}
 }
diff --git a/error_prone/error_prone_annotations-2.32.0.jar b/error_prone/error_prone_annotations-2.32.0.jar
deleted file mode 100644
index 23649c3..0000000
--- a/error_prone/error_prone_annotations-2.32.0.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.32.0.jar.asc b/error_prone/error_prone_annotations-2.32.0.jar.asc
deleted file mode 100644
index 330a602..0000000
--- a/error_prone/error_prone_annotations-2.32.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmbh3KkACgkQ02Srqjmk
-cyD/1BAAjiRb4GPsAVFuFfPfzB61QpasxA3ESciQWPD5y+WxzGhECXD8B4OtPFHz
-qERxAT1oAj+ZIzIzf+qc6c5TXMTGKdXXrUHBC+ACIk0T0dJm31IOwv7hAbHX8JCr
-RetiO0GzVMAulW5J54Y0ADQ0RTAQLPFooUcjjZiya3e+ohOtXgK049FjqcRO00cP
-MhYr6NWoRIG9viGTqmrSZcPF9LaKonNeCZ8TB9tCAjTU8bVn00VV5jZmIuMY4Nwf
-Sk0phft9pa5wOkDYjVgz7wWzpQ8ENafs1elG5m2+dhLqQn+yM8/T6UL+SQsZXUnt
-j2Z0InyrdIu3iCohY+2Gd2V2+6TCJZYODleJxDbDGeASHZMwD+IpmyMZCUDrrjGs
-YEObtM734HYvyAVDSbD75qZgonLU5ccjvi285z9IjyHWWTYJySJd4HhFzRlYWXFo
-b8KrPKr1mPY3asKp/zkKMHlvuGMX57Zp3VndyWCnZGt57wcN9JglSKz6ywch530T
-flXQqAu6c8skA4GaVVy6r31M0jhzyHfxOFHpWqFdQZIHMqIEVQFYxbjOig0GUn/8
-Nf+XIF9vd9J1QLGro8mY03qWRHciJVgdmOZ3HW2VfiN4ZOewgacpaxJ+hZJVxOwd
-QefHa5mIXVj1IFBuktH/LNvDNbO0HHiUnxxyR4jQR9XTWKfWXYE=
-=L5wl
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.32.0.jar.sha1 b/error_prone/error_prone_annotations-2.32.0.jar.sha1
deleted file mode 100644
index 980baa5..0000000
--- a/error_prone/error_prone_annotations-2.32.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e5b2f8b1dede30f5f5bb0baf44f466397ce6b4f7
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.36.0.jar b/error_prone/error_prone_annotations-2.36.0.jar
new file mode 100644
index 0000000..740268b
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.36.0.jar
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.36.0.jar.asc b/error_prone/error_prone_annotations-2.36.0.jar.asc
new file mode 100644
index 0000000..c684b01
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.36.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmc73gkACgkQ02Srqjmk
+cyAnfRAAis7vXEp/79sLw0XkblPDIwDf38P52Cnpm9dhY9emG00Wz+RuB0W6pbBT
+8Ct6cVtQVE6JPNiDCN+WSoZ/0Pi8ipeoZkmygmz5LZGRdcAGfmM/wOjO/Drxn72B
+eOZyjeHcRVo6C28SpormZHC3cOiqdUp6v8w9DVhwxWuC37vmhFqT4DlZgUfl2J8/
+EUp5+Z3+xgmM5+IJP0fjZOGJXYIyknwQRKJVkUjvbwKFOuT4122zNiPBDLz/58bE
+nAVQ1yvOW9iqnQvEE8IGxcK/9wTakCyfnM3AW+ykedL2sR6yRgtTeExalBeP4QoZ
+Bk7xAyOdUpmpFG9fa2iX8itnATSLkYw0YcBFShNiALw7EDHV/1op1iQCkcTZ4y9U
+BG61c2rpOxu0ylKAVF4JRkndnb7VJhWjohfj4YQ/XfUpBhB9IeaV4hnl7VLuQmV6
+8SFEm++clyhCoE8tyqPPFomm+VfBVz0OywxnTOjFPA44qLdwdlUyc7WHV9vh5UBq
+esiy5RStDr1KgTV3dCp9C92fi7XURCkEqzxo7/gRynos/K15RbbS6x66Ro2Qb2Ws
+YtD61DHGCPYDcftUFb1E+S07PUd5snvLNZjy/A+RTdFGVjzvy2vZlwNQByeyGDQW
+/WCvwYGzGuT6OZE8pIJgWX7paamWY2yV/wkNQ62+2+rHy0alpXA=
+=N2/n
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.36.0.jar.sha1 b/error_prone/error_prone_annotations-2.36.0.jar.sha1
new file mode 100644
index 0000000..2770835
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.36.0.jar.sha1
@@ -0,0 +1 @@
+227d4d4957ccc3dc5761bd897e3a0ee587e750a7
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.32.0-with-dependencies.jar b/error_prone/error_prone_core-2.32.0-with-dependencies.jar
deleted file mode 100644
index 45c3307..0000000
--- a/error_prone/error_prone_core-2.32.0-with-dependencies.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_core-2.32.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.32.0-with-dependencies.jar.asc
deleted file mode 100644
index 2d9c031..0000000
--- a/error_prone/error_prone_core-2.32.0-with-dependencies.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmbh3YgACgkQ02Srqjmk
-cyCyfw/+MPJCQZNB7POBkpbdLEx9nhIFR1Ut6hC96EprtjGXj3yNuGhOAbw+PrcH
-560Bx8krfYsLR3WCfRWJo/mWBhnfsMNZpOXsjTwocTx3G0SRPjz+czBwnduDxCwG
-0SmW1RYG7G2bG0NoUV5bbUOdu792AzZIk8pcwCFIejKSex4lE9YNL41Hk4He6gby
-cXeRoA+Mv/Rbav+4QnhA0kyHiRkg+vDs3ZJ42zP3L4EDMAUlttfrFdtUy+PgBSch
-UOjF5S0gF708AzSP3nc71KSBdOIUxLRHcnN9VUid4IBfOV1qR+ECSePlv5KYJkd2
-rWrB7BFMz5XhCGsDoD9ThFtoG7VSA9ooqHgnN/IqGJeQ+QYuuEsXy5FXIQjXBZHa
-mRYxsNgAvHFI0kbP3Bc7Ru/jSYVgIwgDMLK+HBbOzvW6KzPez2Lug+IL60f15IKB
-W005wj18Tj5RzfLUKhOyWR/EIAiXi+tsyO1Pd5CcBDdPGU7IzR9kzTGZUL7eh3L0
-LxaJjZtvWFnv6YxnUVKpeDV81wckZPKOsiOcxEgoEAivg7ER7rYTJJ1D81WTHyU1
-O1RUQ/FIjQVf0YrBhiTYiD+Is7RJuGyR7fUqcKgZLPD6xslYbL5NXHzQ6z2q9kFs
-uoO8FMRyRIGSM+hut137hlmPhHVndKvsRj0tlyaCeV6jNuykkcU=
-=V1CQ
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.32.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.32.0-with-dependencies.jar.sha1
deleted file mode 100644
index a94c051..0000000
--- a/error_prone/error_prone_core-2.32.0-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-52e5d5f6919c79554c994c5ce81c98846ba59880
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.36.0-with-dependencies.jar b/error_prone/error_prone_core-2.36.0-with-dependencies.jar
new file mode 100644
index 0000000..3708b73
--- /dev/null
+++ b/error_prone/error_prone_core-2.36.0-with-dependencies.jar
Binary files differ
diff --git a/error_prone/error_prone_core-2.36.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.36.0-with-dependencies.jar.asc
new file mode 100644
index 0000000..f32cd96
--- /dev/null
+++ b/error_prone/error_prone_core-2.36.0-with-dependencies.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmc73uEACgkQ02Srqjmk
+cyDFIg//aS0bx8g2OromeFeZmWVLTlKRLi1pF4/kuC89K5Wluq5XU7FVKNIa/hJG
++HZieDN/GC3jrseY2Wp1OS3+WKIlPpoY+VdwHosev/qcPNrtDVt8xLWZ1chK1eOT
+YulIxt1qXCapLatWav1dQGoehmoZtwLG+jPNn/CRzcl9KHLQlV1nkbeLo2g6rqEc
+tRwuui1gFbx0lckVlYf8xtxS0QRIZHlqG4zzF0JCqH5wlHQVsJxpra0dtKvdbPJz
+YfML6P423Nvcnbnew+iEXqRgU8ua/wrJI1hgN3rhroj8hVBBB/FFDQtSPSWG896Q
+lUsCaC2FrMkDo+tVQ8WlorqDgL1DpBN7R1SzzSyv+pYuAjlOpvnZ87RRy+dJUHsC
+OcSVCR3LTiWQNZV6fmki/LuWPf1NQCvxukFa0lRNvmTCIpxbE5Ga8N27q4dMLwzv
+N+r0VVzKIvVf2PTtXvtACvqQK76fDjdkQU/TbFjgGCq4sSN1RM4dmFwIDvR5xkqy
+c1NvEoDzWj5CXYwArlQ1k+x0lfXueBw6Ii4VJIaL5nVVZyB0oPCoACtIeINDwlvu
+DG96vM3JN7Mncpr/Um3kAzZ9Pxik5UH/l9FENte0ttcg/5XS1t7DsooXcXTX0jUk
+hzUN2L9uWcK7ZZbRvoSImNz6ESkvfB4lBUe+sXsMhzSsyvYW59E=
+=U7JC
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.36.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.36.0-with-dependencies.jar.sha1
new file mode 100644
index 0000000..a0204e0
--- /dev/null
+++ b/error_prone/error_prone_core-2.36.0-with-dependencies.jar.sha1
@@ -0,0 +1 @@
+3cefb3562928b6e91c13424ae83083994f7230e1
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.32.0.jar b/error_prone/error_prone_test_helpers-2.32.0.jar
deleted file mode 100644
index 57d7ec0..0000000
--- a/error_prone/error_prone_test_helpers-2.32.0.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_test_helpers-2.32.0.jar.asc b/error_prone/error_prone_test_helpers-2.32.0.jar.asc
deleted file mode 100644
index de0b3c7..0000000
--- a/error_prone/error_prone_test_helpers-2.32.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmbh3MIACgkQ02Srqjmk
-cyBlSg/+L/3FBqbbR6HHXwyBiJ+CRBUcyEuqKYsP40qGWViRmnYiv+zFgoOggjyE
-HEG9ltivjapAQ7/s5XBgse9jVc5bqojTBbBAKeplysHqq4b3FY/beemoqaMuO9za
-yS5Te04p50PHKX8BW3bY93DyABD1XjC9I+ILMCA5V1z3XfImXMK/pI2Dr7Oh2kEl
-cbnJw0gI/0fZ1l3Clmj4mrC6Ohz2wsNtSSswjKTSu/kPPLeDENh/FQbRE+c83rUi
-y75vjRZ5gUkR4AGO46N5hWtXqtoaFSfNxSdmOAHAOWlzRTEnHaWbVzMl+geVmuYZ
-DcNRV+39rbYmGI7lXG2f9gNwI0ubDL2p8GLyakRNVrjWwRD6yfg9EM0V8LMgaeN8
-glnivpj/Fbe2ZKbVGheAjQUxGoyHH63suxW38jtmjVMMV6RIPs0N18A3lMlSO+Sw
-lU034yW0w/Xi7sAeODvdiJmorYt2qV9n6Y3yW619iUjCl35/uO5uKQDW5qqe5WON
-RExK2CVed6RnMehmh1PxrtjeGyE2MAQ8MmOKqWhImh8lWEYMf4qqXKW521rE21Gd
-IHxyRAKofQPPKW87MnLvFNvAjxf66XM3dga4+MI5oBvmOnXdS5deLfDrFie5f4+w
-wxVXl7Px1t/ABfXC/erOyx2T/YjRUNJA5eitM7xW310XbxaORAw=
-=3PWm
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.32.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.32.0.jar.sha1
deleted file mode 100644
index a7e8a0a..0000000
--- a/error_prone/error_prone_test_helpers-2.32.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b09561c02605493711f23d01e00b8fe8895100fe
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.36.0.jar b/error_prone/error_prone_test_helpers-2.36.0.jar
new file mode 100644
index 0000000..39053cb
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.36.0.jar
Binary files differ
diff --git a/error_prone/error_prone_test_helpers-2.36.0.jar.asc b/error_prone/error_prone_test_helpers-2.36.0.jar.asc
new file mode 100644
index 0000000..4f2cd67
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.36.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmc73iIACgkQ02Srqjmk
+cyCAixAAl3/4f7l11jv3NbtuOJeDxTf64bw5NTvRf+YdynQmDJGGbpt9/zYvmZbW
+GiViPEHvncHDc26bvl6qWEAjHKyCJx4mNcIKZahT8qc1jHL1CJSLcMiLb0kVVNqv
+FQLLy7mSyTsRKhvyF1dEDU034zXtDs9lhwbOZijPcqzSbLRa+vorOfFKDG/AfTCJ
+IaD8V7s7GcXzDpBuIXKQlj+zLVi14RJCCVuRjtKrRthE3stusxCDwaLSHarBrT0D
+crPtnyaQg85CzTWddOiVujbjgs5Rgn6fqYuTONpcdXcIvbD3cjl++mZHCgG7Z4of
+jAaGk0OMVVrLgd0sTI5X5gBg+TlZ5yMRKUdiqDTEVGh04VnxoSD7fAcJ3OT1F4Wv
+sZREMA9QfkTuo+3RQexcPJsn7EwF6SLNXysUA3XCtaZ3ibiSpmC5nwCYe2+UzU/1
+Zytl7WGrui/Y0Ubtd5daizBgaQuUVhs5rFAAEiC3qLrENNkC2SNDYKGHWD5BzMQy
+j0Thoa5zNkNS5wW+i6vhkViW8Lljr4PraDxvPcsC6jvLeLfE1QReZVU6vPm8dY28
+MNKq5WP2sNg4cm0GSKRsVtXCI85fDWFQd0eqch1sTwLIYEsym1GmMWAukWkEskLS
+5MhfV6MGSnH+z9k26x+Jn0wJQvswXX8FzMXbjpeneRwSLUrNroM=
+=9R9O
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.36.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.36.0.jar.sha1
new file mode 100644
index 0000000..dde2cb0
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.36.0.jar.sha1
@@ -0,0 +1 @@
+fb272f69c7ba9cc46fb517e9889021481517612d
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.32.0.jar b/error_prone/error_prone_type_annotations-2.32.0.jar
deleted file mode 100644
index a221e13..0000000
--- a/error_prone/error_prone_type_annotations-2.32.0.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.32.0.jar.asc b/error_prone/error_prone_type_annotations-2.32.0.jar.asc
deleted file mode 100644
index ebd39c0..0000000
--- a/error_prone/error_prone_type_annotations-2.32.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmbh3MUACgkQ02Srqjmk
-cyCoGQ//W45vsz6ScmyNuim+kYP9Em0XeDUanEpbhRl2Lie04COi3Dl8pSThwOjT
-nEykUQunjrnYDcO+L4XUQ+PdOsrmE/vw9v250c9WhUF4HyGTvINdXTEbVEiPb0g1
-Z7YdHgYLSBTUt0BNjoyAnUiPDn83hKnUO6Xtd9bRnzwrh22mAXZjks09SbbGc4pU
-uojnJmVXt3tL7AU46JyINOm/QzYZTFPEIwQDoNRREpWcOVVavCDXYtLk8KSds3ph
-19rRX9bm+gn3/fqu/f1VLi5l7DK2tQrb8Nt4BL8hq1Rg0iX9IQo84YwEXvPJ760z
-ISOsghCBVpzkR2KnfX0WWnaFPwyK3jvTgbUhlj9Ditoq0kx7wqvnlT2xzeVvJDjg
-wS84AY8rHRgIP5aIcsS9TWU6AF69hVab1fbPi96Ata3uC97EdqGGa4t/+fLviBva
-OtpZgrTFx7gauZbc2Zl26IQDgUt1kS8UU+iJMweLLwlOGt0CP2+0GbpwACi4FQ3v
-Adymn+GzfR4R5amsBrYxxcnb08jI4LPCjfB3vNZQWD7pWIBms9SzVUuD8iiAFw6L
-HaJcasHJqR8dmPOsMABjAbU+oga2TP28np+G0AUvrITFm3l9wdHGAkmjG9j0/KP3
-0Tn7/ksOrB2G8Cde6v7N8x5UNF2jyvLI6SU0NPU7Kf9se1OjkyA=
-=obvF
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.32.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.32.0.jar.sha1
deleted file mode 100644
index 97e70ec..0000000
--- a/error_prone/error_prone_type_annotations-2.32.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06ad5d0e918cfcc4c27fb362ee12f2045cc63b04
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.36.0.jar b/error_prone/error_prone_type_annotations-2.36.0.jar
new file mode 100644
index 0000000..e63a437
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.36.0.jar
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.36.0.jar.asc b/error_prone/error_prone_type_annotations-2.36.0.jar.asc
new file mode 100644
index 0000000..98549b7
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.36.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmc73iYACgkQ02Srqjmk
+cyC1JxAAiPcs5CylbY/xdJN61fY80/B4TizLuS3jJ9vpIACK4evwB+mM9n9Xlueo
+2PfTYQROnYTaMJoL26cwUG1AD7q297zq1hfvmQhUqXCs0CznTk2Ku8dSW0G9cFWO
+6NpaGkdMsOhUdGkwUE962JUMZReONtg7Z2+CP6XZo9m0+PfUMYqCOWaKkaFtKjF+
+eSz0FuEYQ7GYSxkQ5XuiQFJsZOLW0jKplF5llaCgt8SKt3I6oloI69FMdtoabVhr
++NhD6g5eH89517EiUfrekpjeIQ/riuXsCO5bpH82/LLNOe4IF6ckamhZbTvyrx3O
+EUd6ouBQxN693p8uz7bCgwhXFsSfEhuYs9fXFob45bGbInAf3KWvKHYl0rp2vFO0
+8+WR8+FS5GXJYNQGAnqas9md6cyZBu+Fz1rtf/BWnF2wSbDfKa3mLOc5cCqF1PhZ
+2fGg0Ii5SeTinshyfoC7MNoczNU6OxSGe/e5VTG+T+C8fKNnKbbzBOjcuFpSF42A
+zRdblncF1GtlgcgfMDJZC8W6yCUL4WK04l0yyGVdz4C3rHGxUVxNhyn4U9JPCAgs
+bm+1r5sgD1qcob1SzXlHhqJGI4YclNuDa42FK4DzZCSTux8Z8PX7R/udzgHFZJJo
+yuEkDjwgwD8AKyHvBaZzp0boHbsFBANeYeuPDYefn6A2LK0Sfdc=
+=TflN
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.36.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.36.0.jar.sha1
new file mode 100644
index 0000000..d106798
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.36.0.jar.sha1
@@ -0,0 +1 @@
+e8cf97ae8ae15010636e6847b3715d1cfb559420
\ No newline at end of file
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 20e74e7..5d66a3c 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,9 +22,9 @@
 	// These values are set into build/soong/java/config/config.go so that soong doesn't have any
 	// references to external/error_prone, which may not always exist.
 	config.ErrorProneClasspath = []string{
-		"external/error_prone/error_prone/error_prone_core-2.32.0-with-dependencies.jar",
-		"external/error_prone/error_prone/error_prone_annotations-2.32.0.jar",
-		"external/error_prone/error_prone/error_prone_type_annotations-2.32.0.jar",
+		"external/error_prone/error_prone/error_prone_core-2.36.0-with-dependencies.jar",
+		"external/error_prone/error_prone/error_prone_annotations-2.36.0.jar",
+		"external/error_prone/error_prone/error_prone_type_annotations-2.36.0.jar",
 		"external/error_prone/checkerframework/dataflow-errorprone-3.39.0.jar",
 		"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
 	}
@@ -122,6 +122,7 @@
 		"-Xep:MissingSuperCall:WARN",
 		"-Xep:RectIntersectReturnValueIgnored:WARN",
 		"-Xep:SelfAssertion:WARN",
+		"-Xep:DuplicateBranches:WARN",
 	}
 
 	// The checks that are default-disabled
@@ -168,6 +169,8 @@
 		"-XDuseStructuralMostSpecificResolution=true",
 		"-XDuseGraphInference=true",
 		"-XDandroidCompatible=true",
+		// https://github.com/google/error-prone/issues/4595#issuecomment-2424140062
+		"--should-stop=ifError=FLOW",
 		// As we emit errors as warnings,
 		// increase the warning limit.
 		"-Xmaxwarns 9999999",
@@ -175,14 +178,14 @@
 		// Extra flags needed by ErrorProne for OpenJDK9 from
 		// http://errorprone.info/docs/installation
 		"-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-		"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-		"-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+		"-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
 		"-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-		"-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-		"-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-		"-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
 		"-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
-		"-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+		"-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+		"-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+		"-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+		"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+		"-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
 		"-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
 	}
 }