diff --git a/build-tools/automation/azure-pipelines-oss.yaml b/build-tools/automation/azure-pipelines-oss.yaml
index 880ad3957d7..1a3ef9c06b6 100644
--- a/build-tools/automation/azure-pipelines-oss.yaml
+++ b/build-tools/automation/azure-pipelines-oss.yaml
@@ -174,6 +174,9 @@ stages:
 
     - template: yaml-templates/setup-ubuntu.yaml
 
+    - script: make prepare V=1 PREPARE_CI_PR=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
+      displayName: make prepare
+
     - script: make jenkins V=1 PREPARE_CI_PR=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
       displayName: make jenkins
 
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index ee88dfd2b93..644f56c9e6c 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -436,6 +436,10 @@ stages:
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make prepare-external-git-dependencies
 
+    - script: make prepare PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
+      workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
+      displayName: make prepare
+
     - script: make jenkins V=1 PREPARE_CI=1 PREPARE_AUTOPROVISION=1 CONFIGURATION=$(XA.Build.Configuration)
       workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
       displayName: make jenkins
diff --git a/build-tools/scripts/msbuild.mk b/build-tools/scripts/msbuild.mk
index bfb7020ca28..43756e8facf 100644
--- a/build-tools/scripts/msbuild.mk
+++ b/build-tools/scripts/msbuild.mk
@@ -37,11 +37,15 @@ ifeq ($(MSBUILD),msbuild)
 export USE_MSBUILD  = 1
 endif   # $(MSBUILD) == msbuild
 
+ifneq ($(V),0)
+MSBUILD_FLAGS += /v:diag
+endif   # $(V) != 0
+
 ifeq ($(USE_MSBUILD),1)
 
 # $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD),outdir=Build)
 define MSBUILD_BINLOG
-	$(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS) /v:normal \
+	$(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS) \
 		/binaryLogger:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/$(if $(3),$(3),Build)$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog"
 endef
 
@@ -59,10 +63,6 @@ else    # $(_CSC_EMITS_PDB) == ''
 MSBUILD_FLAGS += /p:_DebugFileExt=.mdb
 endif   # $(_CSC_EMITS_PDB) == Pdb
 
-ifneq ($(V),0)
-MSBUILD_FLAGS += /v:diag
-endif   # $(V) != 0
-
 # $(call MSBUILD_BINLOG,name,msbuild=$(MSBUILD))
 define MSBUILD_BINLOG
 	$(if $(2),$(2),$(MSBUILD)) $(MSBUILD_FLAGS)
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Windows.cs b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Windows.cs
index 5a2077a085a..38fd79de845 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Windows.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternalJavaInterop.Windows.cs
@@ -9,6 +9,19 @@ partial class Step_PrepareExternalJavaInterop
 #pragma warning disable CS1998
 		async Task<bool> ExecuteOSSpecific (Context context)
 		{
+			string javaInteropDir = context.Properties.GetRequiredValue (KnownProperties.JavaInteropFullPath);
+			string projectPath = Path.Combine (javaInteropDir, "build-tools", "Java.Interop.BootstrapTasks", "Java.Interop.BootstrapTasks.csproj");
+			var msbuild = new MSBuildRunner (context);
+			bool result = await msbuild.Run (
+				projectPath: projectPath,
+				logTag: "java-interop-prepare",
+				binlogName: "build-java-interop-prepare"
+			);
+
+			if (!result) {
+				Log.ErrorLine ("Failed to build java-interop-prepare");
+				return false;
+			}
 			return true;
 		}
 #pragma warning restore CS1998
diff --git a/external/Java.Interop b/external/Java.Interop
index f359e731022..8f7ddcdd448 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit f359e7310225e333358e08f6549bbe79848af44f
+Subproject commit 8f7ddcdd4486b14a12cd4ccf89467ae7a5192224