diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 19fdd25d1ac..fcbc73f0744 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -3077,6 +3077,41 @@ because xbuild doesn't support framework reference assemblies.
   </CalculateProjectDependencies>
 </Target>
 
+<PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+  <EnableCleanAllFiles Condition="'$(EnableCleanAllFiles)' == ''">true</EnableCleanAllFiles>
+  <EnableCleanOnNuGetPackagesChange Condition="'$(EnableCleanOnNuGetPackagesChange)' == ''">true</EnableCleanOnNuGetPackagesChange>
+  <CoreCleanDependsOn Condition="'$(EnableCleanAllFiles)' == 'true'">
+     _CleanAllFiles;
+    $(CoreCleanDependsOn)
+  </CoreCleanDependsOn>
+  <BuildDependsOn Condition="'$(EnableCleanOnNuGetPackagesChange)' == 'true'">
+    _CleanOnNuGetPackagesChange;
+    $(BuildDependsOn)
+  </BuildDependsOn>
+</PropertyGroup>
+
+<Target Name="_CleanAllFiles">
+  <ItemGroup>
+    <Clean Include="$(OutputPath)**\*.*" />
+    <Clean Include="$(IntermediateOutputPath)**\*.*" Exclude="$(_AndroidDesignTimeResDirIntermediate)\**\*.*" />
+  </ItemGroup>
+</Target>
+
+<Target Name="_BeforeCleanOnNuGetPackagesChange">
+  <PropertyGroup>
+    <_NuGetAssetsFile Condition="Exists('$(ProjectLockFile)')">$(ProjectLockFile)</_NuGetAssetsFile>
+    <_NuGetAssetsFile Condition="'$(_NuGetAssetsFile)' == '' and Exists('packages.config')">packages.config</_NuGetAssetsFile>
+  </PropertyGroup>
+</Target>
+
+<Target Name="_CleanOnNuGetPackagesChange" DependsOnTargets="_BeforeCleanOnNuGetPackagesChange"
+        Inputs="$(_NuGetAssetsFile)"
+        Outputs="$(ProjectLockFile).stamp">
+  <CallTarget Targets="Clean" />
+  <Touch Files="$(ProjectLockFile).stamp" AlwaysCreate="true" />
+</Target>
+
+
 <Import Project="$(MSBuildThisFileDirectory)Xamarin.Android.Common.Debugging.targets"
         Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.Android.Common.Debugging.targets')"/>