diff --git a/source/GooglePlayServicesProject.cshtml b/source/GooglePlayServicesProject.cshtml
index 10cb708af..ee161a71a 100644
--- a/source/GooglePlayServicesProject.cshtml
+++ b/source/GooglePlayServicesProject.cshtml
@@ -201,11 +201,18 @@
   </ItemGroup>
 
 
+  @*
   <!--
-    NOTE: Version of Xamarin.Build.Download is important for attributes in GooglePlaySericestargets.cshtml template    
+  NOTE: 
+  Xamarin.Build.Download version set in GooglePlaySericesProjects.cshtml template is 
+  important for attributes in GooglePlaySericesTargets.cshtml template
+  
+  XamarinBuildDownloadAndroidAarLibrary   v >=  0.10.0
+  XamarinBuildDownloadRestoreAssemblyAar  v <   0.10.0
   -->
+  *@
   <ItemGroup>
-    <PackageReference Include="Xamarin.Build.Download" Version="0.8.0" />
+    <PackageReference Include="Xamarin.Build.Download" Version="0.7.0" />
   </ItemGroup>
   
 
diff --git a/source/GooglePlayServicesTargets.cshtml b/source/GooglePlayServicesTargets.cshtml
index 5e4fa406f..a0572f658 100644
--- a/source/GooglePlayServicesTargets.cshtml
+++ b/source/GooglePlayServicesTargets.cshtml
@@ -29,7 +29,7 @@
   </ItemGroup>
   <PropertyGroup>
     <AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
-  </PropertyGroup>  
+  </PropertyGroup>
   }
 
   @foreach (var art in @Model.MavenArtifacts) {
@@ -59,12 +59,15 @@
     <ItemGroup>
         @*
         <!--
-        NOTE: Version of Xamarin.Build.Download is important for attributes in GooglePlaySericestargets.cshtml template   
+        NOTE: 
+        Xamarin.Build.Download version set in GooglePlaySericesProjects.cshtml template is 
+        important for attributes in GooglePlaySericesTargets.cshtml template
+        
         XamarinBuildDownloadAndroidAarLibrary   v >=  0.10.0
         XamarinBuildDownloadRestoreAssemblyAar  v <   0.10.0
         -->
         *@
-      <XamarinBuildDownloadAndroidAarLibrary Include="$(XamarinBuildDownloadDir)@(xbdAarPath)" />
+      <XamarinBuildDownloadRestoreAssemblyAar Include="$(XamarinBuildDownloadDir)@(xbdAarPath)" />
     </ItemGroup>
   </Target>
       }