diff --git a/NuGet.config b/NuGet.config
index dec1baffe92..08645f897d6 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,6 +8,8 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-android -->
+    <add key="darc-pub-dotnet-android-9a2d211" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-9a2d211b/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-android-9a2d211-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-9a2d211b-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-android -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- ensure only the sources defined below are used -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8e497ddbbc4..be506bfd4eb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -30,9 +30,9 @@
       <Sha>2b2a06c8a4d45ec0781266ffa3f3852a052f0fbb</Sha>
     </Dependency>
     <!-- Previous .NET Android version(s) -->
-    <Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.1.12">
+    <Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.1.30">
       <Uri>https://github.com/dotnet/android</Uri>
-      <Sha>d611c1210ffde26280ee0faddd04e7621af41f1e</Sha>
+      <Sha>9a2d211ba972d3a0c4c108e043def432f3ec2620</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8d1d34b3fe8..d87b6a2fe34 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,7 +17,7 @@
     <MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26076.102</MicrosoftDotNetCecilPackageVersion>
     <SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
     <!-- Previous .NET Android version -->
-    <MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.12</MicrosoftNETSdkAndroidManifest100100PackageVersion>
+    <MicrosoftNETSdkAndroidManifest100100PackageVersion>36.1.30</MicrosoftNETSdkAndroidManifest100100PackageVersion>
     <AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest100100PackageVersion)</AndroidNetPreviousVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
index fb633494019..d1fa33ce373 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
@@ -177,8 +177,6 @@ public XamarinProject (string debugConfigurationName = "Debug", string releaseCo
 	<PropertyGroup>
 		<Configuration>{Configuration}</Configuration>
 		<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
-		<!-- Prevent .NET SDK from adding the host RID to RuntimeIdentifiers, see: https://github.com/dotnet/android/issues/10722 -->
-		<UseDefaultPublishRuntimeIdentifier>false</UseDefaultPublishRuntimeIdentifier>
 	</PropertyGroup>
 </Project>"
 			});