diff --git a/Configuration.props b/Configuration.props
index cc9f45186b6..92a84c6c2c9 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -36,7 +36,7 @@
     -->
     <!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
     <AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">37</AndroidLatestUnstableApiLevel>
-    <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">37</AndroidLatestUnstablePlatformId>
+    <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">37.0</AndroidLatestUnstablePlatformId>
     <AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v17.0</AndroidLatestUnstableFrameworkVersion>
     <!-- The default API level used for $(TargetPlatformVersion) -->
     <AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>
diff --git a/build-tools/api-merge/merge-configuration.xml b/build-tools/api-merge/merge-configuration.xml
index a11e8e4ebab..873b141b6b5 100644
--- a/build-tools/api-merge/merge-configuration.xml
+++ b/build-tools/api-merge/merge-configuration.xml
@@ -26,9 +26,9 @@
     <File Path="api-35.xml.in" Level="35" />
     <File Path="api-36.xml.in" Level="36" />
     <File Path="api-36.1.xml.in"  Level="36.1" />
-    <File Path="api-37.xml.in" Level="37" />
+    <File Path="api-37.0.xml.in" Level="37" />
   </Inputs>
   <Outputs>
-    <File Path="api-37.xml"    LastLevel="37" />
+    <File Path="api-37.0.xml"    LastLevel="37" />
   </Outputs>
 </Configuration>
\ No newline at end of file
diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
index c8d783c12ad..b170d2b8324 100644
--- a/build-tools/automation/yaml-templates/variables.yaml
+++ b/build-tools/automation/yaml-templates/variables.yaml
@@ -63,7 +63,7 @@ variables:
 - name: IsRelOrTargetingRel
   value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
 - name: DefaultTestSdkPlatforms  # Comma-separated SDK Platform(s) to install on test agents (no spaces)
-  value: 35,36,36.1,37
+  value: 35,36,36.1,37.0
 - name: DefaultJavaSdkMajorVersion
   value: 17
 - name: LatestJavaSdkMajorVersion
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
index 6e13faa5f7e..ab2ab8e8fdb 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -50,7 +50,7 @@ class BuildAndroidPlatforms
 			new AndroidPlatform (apiName: "VanillaIceCream",        apiLevel: 35, platformID: "35",  include: "v15.0",   framework: "v15.0"),
 			new AndroidPlatform (apiName: "Baklava",                apiLevel: 36, platformID: "36",  include: "v16.0",   framework: "v16.0"),
 			new AndroidPlatform (apiName: "CANARY",                 apiLevel: new Version (36, 1),   platformID: "36.1", include: "v16.1",   framework: "v16.1", stable: true),
-			new AndroidPlatform (apiName: "CinnamonBun",            apiLevel: new Version (37, 0),   platformID: "37",   include: "v17.0",   framework: "v17.0", stable: false),
+			new AndroidPlatform (apiName: "CinnamonBun",            apiLevel: new Version (37, 0),   platformID: "37.0", include: "v17.0",   framework: "v17.0", stable: false),
 		};
 
 	}
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
index 1baf6711b26..16aa5bb9958 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
@@ -75,7 +75,7 @@ public AndroidToolchain ()
 				new AndroidPlatformComponent ("platform-35_r02",   apiLevel: "35", pkgRevision: "2"),
 				new AndroidPlatformComponent ("platform-36_r02",   apiLevel: "36", pkgRevision: "2"),
 				new AndroidPlatformComponent ("platform-36.1_r01", apiLevel: "36.1",    pkgRevision: "1", isLatestStable: true),
-				new AndroidPlatformComponent ("platform-37.0_r01", apiLevel: "37",      pkgRevision: "1", isLatestStable: false, isPreview: true),
+				new AndroidPlatformComponent ("platform-37.0_r01", apiLevel: "37.0",    pkgRevision: "1", isLatestStable: false, isPreview: true),
 
 				new AndroidToolchainComponent ("source-36_r01",
 					destDir: Path.Combine ("sources", "android-36"),
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index ec5040ad515..a4281785292 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit ec5040ad5158f240a67d887133dd56cfa5eb74ba
+Subproject commit a4281785292065ab7f5c0298f0f88f51b73ffb2c
diff --git a/src/Mono.Android/Profiles/api-37.params.txt b/src/Mono.Android/Profiles/api-37.0.params.txt
similarity index 100%
rename from src/Mono.Android/Profiles/api-37.params.txt
rename to src/Mono.Android/Profiles/api-37.0.params.txt
diff --git a/src/Mono.Android/Profiles/api-37.xml b/src/Mono.Android/Profiles/api-37.0.xml
similarity index 100%
rename from src/Mono.Android/Profiles/api-37.xml
rename to src/Mono.Android/Profiles/api-37.0.xml
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index 6b18481d858..20ba57753b1 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -2068,7 +2068,7 @@
   <attr api-since="36.1" path="/api/package[contains(@merge.SourceFile,'api-CANARY.xml.in')]/interface" name="no-alternatives">true</attr>
   <attr api-since="36.1" path="/api/package[contains(@merge.SourceFile,'api-36.1.xml.in')]/interface" name="no-alternatives">true</attr>
   <attr api-since="37" path="/api/package[contains(@merge.SourceFile,'api-CinnamonBun.xml.in')]/interface" name="no-alternatives">true</attr>
-  <attr api-since="37" path="/api/package[contains(@merge.SourceFile,'api-37.xml.in')]/interface" name="no-alternatives">true</attr>
+  <attr api-since="37" path="/api/package[contains(@merge.SourceFile,'api-37.0.xml.in')]/interface" name="no-alternatives">true</attr>
 
   <!-- Set ApiSince based on merge sourcefile. -->
   <attr api-since="22" path="/api//*[contains(@merge.SourceFile,'api-22.xml.in')]" name="api-since">22</attr>
@@ -2096,7 +2096,7 @@
   <attr api-since="36.1" path="/api//*[contains(@merge.SourceFile,'api-CANARY.xml.in')]" name="api-since">36.1</attr>
   <attr api-since="36.1" path="/api//*[contains(@merge.SourceFile,'api-36.1.xml.in')]" name="api-since">36.1</attr>
   <attr api-since="37" path="/api//*[contains(@merge.SourceFile,'api-CinnamonBun.xml.in')]" name="api-since">37</attr>
-  <attr api-since="37" path="/api//*[contains(@merge.SourceFile,'api-37.xml.in')]" name="api-since">37</attr>
+  <attr api-since="37" path="/api//*[contains(@merge.SourceFile,'api-37.0.xml.in')]" name="api-since">37</attr>
 
   <!-- Erase some 'api-since' attributes (This has to be done after they are set above) -->