diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 6f3c5435186..a0718dccb76 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -60,7 +60,7 @@
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; build @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Sdk.Windows.binlog&quot; -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.NET.Sdk.Android.binlog&quot; &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
     <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Microsoft.Android.Templates.binlog&quot; &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(_BinlogPrefix)Xamarin.Android.Tools.AndroidSdk.binlog&quot; &quot;$(XamarinAndroidSourcePath)external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj&quot;" />
+    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:IsPacking=true &quot;$(_BinlogPrefix)Xamarin.Android.Tools.AndroidSdk.binlog&quot; &quot;$(XamarinAndroidSourcePath)external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj&quot;" />
     <ReplaceFileContents
         SourceFile="vs-workload.in.props"
         DestinationFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\vs-workload.props"
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 975f894882a..68ea438d18e 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 975f894882a2f7dde13e734529495557ac8cd496
+Subproject commit 68ea438d18e0c0a7310b9187f4c8ac1f70ed5d60
diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
index 660c5ffd086..b31cecbfd98 100644
--- a/external/xamarin-android-tools.override.props
+++ b/external/xamarin-android-tools.override.props
@@ -1,6 +1,8 @@
 <Project>
   <!-- Import $(LibZipSharpVersion) -->
   <Import Project="..\Directory.Build.props" />
+  <Import Project="..\Configuration.props" />
+  <Import Project="..\build-tools\scripts\XAVersionInfo.targets" />
   <PropertyGroup>
     <AndroidToolsDisableMultiTargeting>true</AndroidToolsDisableMultiTargeting>
     <PackageOutputPath>$(MSBuildThisFileDirectory)..\bin\Build$(Configuration)\nuget-unsigned\</PackageOutputPath>
@@ -9,4 +11,12 @@
       https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
     </RestoreAdditionalProjectSources>
   </PropertyGroup>
+  <Target Name="_GetXAVersionInfo"
+      Condition=" '$(IsPacking)' == 'true' "
+      BeforeTargets="SetVersion"
+      DependsOnTargets="GetXAVersionInfo">
+    <PropertyGroup>
+      <PackageVersionSuffix>-preview.$(PackVersionCommitCount)</PackageVersionSuffix>
+    </PropertyGroup>
+  </Target>
 </Project>