diff --git a/.gitmodules b/.gitmodules
index c9883e88b80..7900eb9c650 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/xamarin/java.interop.git
-    branch = main
+    branch = dev/jonp/ji-typemap-support
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/xamarin/lz4
diff --git a/external/Java.Interop b/external/Java.Interop
index def5bc0df68..b9aa5f7102e 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit def5bc0df68a5908fac85e5dd4f02f1e27c75882
+Subproject commit b9aa5f7102e4e36a4487e3739b8b341a8abd8514