diff --git a/Directory.Build.props b/Directory.Build.props
index b4e7ac8059b..5d705edbbc5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -78,6 +78,8 @@
     <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.NUnitLite.NET.csproj' ">true</_AllowProjectWarnings>
     <_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.ProjectTools.csproj' ">true</_AllowProjectWarnings>
     <TreatWarningsAsErrors Condition=" ('$(RunningOnCI)' == 'true' OR '$(_AndroidTreatWarningsAsErrors)' == 'true') AND '$(_AllowProjectWarnings)' != 'true' ">true</TreatWarningsAsErrors>
+    <!-- Ignore Package Source Mapping warnings when opting in to Central Package Management, as this feature does not work well with darc/maestro -->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
   </PropertyGroup>
 
 </Project>
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index c482ef4cef6..79e16d577d1 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit c482ef4cef6efc51aed1d80a39c801c887e9236e
+Subproject commit 79e16d577d1a315586647e8f242bf405325eb57b