diff --git a/.gitignore b/.gitignore
index 00c41b83..c50ea285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ Resource.designer.cs
 component.yaml
 Details.md
 /generated.targets
-*.commit
\ No newline at end of file
+*.commit
+cake.sh
diff --git a/AndroidSupport.sln b/AndroidSupport.sln
index 8e947776..9432fc97 100644
--- a/AndroidSupport.sln
+++ b/AndroidSupport.sln
@@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "support-
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable-BuildTasks", "support-vector-drawable\buildtask\Vector-Drawable-BuildTasks.csproj", "{DB19F806-FEF2-4BBB-8A0B-37EA54DB3A0D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-UI", "support-core-ui\source\Core-UI.csproj", "{071EAE48-7BCE-4D68-8098-745B923A122F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@@ -67,6 +65,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\sour
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wear", "wear\source\Wear.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Architecture", "Architecture", "{3AC04D8E-9E4C-401F-AED5-239F226BF9C2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -149,10 +157,6 @@ Global
 		{E9848EF1-14E6-4144-95A0-926A52F301B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9848EF1-14E6-4144-95A0-926A52F301B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9848EF1-14E6-4144-95A0-926A52F301B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{071EAE48-7BCE-4D68-8098-745B923A122F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{071EAE48-7BCE-4D68-8098-745B923A122F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -205,5 +209,26 @@ Global
 		{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
+		{25CE44A9-FA51-4468-952F-21A13F066384} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
 	EndGlobalSection
 EndGlobal
diff --git a/External-Dependency-Info.txt b/External-Dependency-Info.txt
index c08472ef..92445244 100644
--- a/External-Dependency-Info.txt
+++ b/External-Dependency-Info.txt
@@ -7,10 +7,10 @@ notice and the license under which Microsoft received such third party
 material are set forth below.  Microsoft reserves all other rights not 
 expressly granted, whether by implication, estoppel or otherwise.
 
-########################################
-# Google Android Support libraries
+#########################################################
+# Google Android Support libraries and Constraint Layout
 # https://maven.google.com/
-########################################
+#########################################################
 
                                  Apache License
                            Version 2.0, January 2004
diff --git a/animated-vector-drawable/component/component.template.yaml b/animated-vector-drawable/component/component.template.yaml
index f33e077c..643888fd 100644
--- a/animated-vector-drawable/component/component.template.yaml
+++ b/animated-vector-drawable/component/component.template.yaml
@@ -20,6 +20,9 @@ samples:
       - Animated-Vector-Drawable
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -32,6 +35,9 @@ samples:
           - Xamarin.Android.Support.Animated.Vector.Drawable
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/animated-vector-drawable/samples/VectorDrawableSample.sln b/animated-vector-drawable/samples/VectorDrawableSample.sln
index d7001b9f..8aeb7b42 100644
--- a/animated-vector-drawable/samples/VectorDrawableSample.sln
+++ b/animated-vector-drawable/samples/VectorDrawableSample.sln
@@ -21,6 +21,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appco
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,5 +73,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj b/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj
index 1cc14dfc..89664d1a 100644
--- a/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj
+++ b/animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj
@@ -105,6 +105,18 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj
index e64bfa27..209a9278 100644
--- a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj
+++ b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj
@@ -75,6 +75,22 @@
       <Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
       <Name>Vector-Drawable</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   <ItemGroup>
diff --git a/appcompat-v7/component/component.template.yaml b/appcompat-v7/component/component.template.yaml
index a43978ff..7d476a34 100644
--- a/appcompat-v7/component/component.template.yaml
+++ b/appcompat-v7/component/component.template.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -31,6 +34,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/appcompat-v7/samples/AndroidSupportSample.sln b/appcompat-v7/samples/AndroidSupportSample.sln
index 7ad2290f..a1a4628d 100644
--- a/appcompat-v7/samples/AndroidSupportSample.sln
+++ b/appcompat-v7/samples/AndroidSupportSample.sln
@@ -23,6 +23,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\su
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,5 +79,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 77bb3802..ce1a48b1 100644
--- a/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/appcompat-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -132,6 +132,18 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/appcompat-v7/source/V7-AppCompat.csproj b/appcompat-v7/source/V7-AppCompat.csproj
index 52df7328..2d2cff1a 100644
--- a/appcompat-v7/source/V7-AppCompat.csproj
+++ b/appcompat-v7/source/V7-AppCompat.csproj
@@ -99,6 +99,22 @@
       <Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
       <Name>Vector-Drawable</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/arch-core/common/nuget/template.nuspec b/arch-core/common/nuget/template.nuspec
new file mode 100644
index 00000000..4b4f7da7
--- /dev/null
+++ b/arch-core/common/nuget/template.nuspec
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Xamarin.Android.Arch.Core.Common</id>
+    <title>Xamarin Android Architecture Core - Common</title>
+    <version>$version$</version>
+    <authors>Xamarin Inc.</authors>
+    <owners>Xamarin Inc.</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Android Architecture Core - Common C# bindings for Xamarin</description>
+    <copyright>Copyright © Microsoft Corporation</copyright>
+    <projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
+    <licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/arch-core-common_128x128.png</iconUrl>
+    <dependencies>
+      <group targetFramework="MonoAndroid80">
+        <dependency id="Xamarin.Android.Support.Annotations" version="26.1.0"/>
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="arch-core/common/nuget/Xamarin.Android.Arch.Core.Common.targets" target="build/MonoAndroid80" />
+
+    <file src="output/Xamarin.Android.Arch.Core.Common.dll" target="lib/MonoAndroid80" />
+
+    <file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
+  </files>
+</package>
diff --git a/arch-core/common/source/Arch.Core.Common.csproj b/arch-core/common/source/Arch.Core.Common.csproj
new file mode 100644
index 00000000..be85961b
--- /dev/null
+++ b/arch-core/common/source/Arch.Core.Common.csproj
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Android.Arch.Core.Common</RootNamespace>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AssemblyName>Xamarin.Android.Arch.Core.Common</AssemblyName>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <!-- <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
+    <AndroidClassParser>class-parse</AndroidClassParser>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!--Docs URL Can be found here: http://dl-ssl.google.com/android/repository/repository-8.xml -->
+    <DroidDocPaths>..\..\..\docs\reference</DroidDocPaths>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+    <TransformFile Include="Transforms\Metadata.xml" />
+    <TransformFile Include="..\..\..\Metadata.generated.xml">
+      <Link>Transforms\Metadata.generated.xml</Link>
+    </TransformFile>
+    <TransformFile Include="..\..\..\Metadata.common.xml">
+      <Link>Transforms\Metadata.common.xml</Link>
+    </TransformFile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Additions\" />
+    <Folder Include="Jars\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedJar Include="..\..\..\externals\arch-core\arch-core-common.jar">
+      <Link>arch-core-common.jar</Link>
+    </EmbeddedJar>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+  
+</Project>
diff --git a/arch-core/common/source/Properties/AssemblyInfo.cs b/arch-core/common/source/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..e78e73aa
--- /dev/null
+++ b/arch-core/common/source/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Xamarin.Android.Arch.Core.Common")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany ("Microsoft Corporation")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/arch-core/common/source/Transforms/EnumFields.xml b/arch-core/common/source/Transforms/EnumFields.xml
new file mode 100644
index 00000000..81f1dc4a
--- /dev/null
+++ b/arch-core/common/source/Transforms/EnumFields.xml
@@ -0,0 +1,3 @@
+<enum-field-mappings>
+</enum-field-mappings>
+ 
\ No newline at end of file
diff --git a/arch-core/common/source/Transforms/EnumMethods.xml b/arch-core/common/source/Transforms/EnumMethods.xml
new file mode 100644
index 00000000..818878c9
--- /dev/null
+++ b/arch-core/common/source/Transforms/EnumMethods.xml
@@ -0,0 +1,2 @@
+<enum-method-mappings>
+</enum-method-mappings>
diff --git a/arch-core/common/source/Transforms/Metadata.xml b/arch-core/common/source/Transforms/Metadata.xml
new file mode 100644
index 00000000..3149c78d
--- /dev/null
+++ b/arch-core/common/source/Transforms/Metadata.xml
@@ -0,0 +1,2 @@
+<metadata>
+</metadata>
\ No newline at end of file
diff --git a/arch-lifecycle/common/nuget/template.nuspec b/arch-lifecycle/common/nuget/template.nuspec
new file mode 100644
index 00000000..e84a0228
--- /dev/null
+++ b/arch-lifecycle/common/nuget/template.nuspec
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Xamarin.Android.Arch.Lifecycle.Common</id>
+    <title>Xamarin Android Architecture Lifecycle - Common</title>
+    <version>$version$</version>
+    <authors>Xamarin Inc.</authors>
+    <owners>Xamarin Inc.</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Android Architecture Lifecycle - Common C# bindings for Xamarin</description>
+    <copyright>Copyright © Microsoft Corporation</copyright>
+    <projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
+    <licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/arch-lifecycle-common_128x128.png</iconUrl>
+    <dependencies>
+      <group targetFramework="MonoAndroid80">
+        <dependency id="Xamarin.Android.Support.Annotations" version="26.1.0"/>
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="arch-lifecycle/common/nuget/Xamarin.Android.Arch.Lifecycle.Common.targets" target="build/MonoAndroid80" />
+
+    <file src="output/Xamarin.Android.Arch.Lifecycle.Common.dll" target="lib/MonoAndroid80" />
+
+    <file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
+  </files>
+</package>
diff --git a/arch-lifecycle/common/source/Additions/Additions.cs b/arch-lifecycle/common/source/Additions/Additions.cs
new file mode 100644
index 00000000..f3cb5532
--- /dev/null
+++ b/arch-lifecycle/common/source/Additions/Additions.cs
@@ -0,0 +1,39 @@
+using System;
+using Android.Runtime;
+
+namespace Android.Arch.Lifecycle
+{
+	public partial class Lifecycle
+	{
+		public partial class Event
+		{
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_CREATE)")]
+			public class OnCreateAttribute : Attribute
+			{ }
+
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_START)")]
+			public class OnStartAttribute : Attribute
+			{ }
+
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_RESUME)")]
+			public class OnResumeAttribute : Attribute
+			{ }
+
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_PAUSE)")]
+			public class OnPauseAttribute : Attribute
+			{ }
+
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_STOP)")]
+			public class OnStopAttribute : Attribute
+			{ }
+
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_DESTROY)")]
+			public class OnDestroyAttribute : Attribute
+			{ }
+
+			[Annotation("android.arch.lifecycle.OnLifecycleEvent(android.arch.lifecycle.Lifecycle.Event.ON_ANY)")]
+			public class OnAnyAttribute : Attribute
+			{ }
+		}
+	}
+}
\ No newline at end of file
diff --git a/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj b/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj
new file mode 100644
index 00000000..dc7f4328
--- /dev/null
+++ b/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Android.Arch.Lifecycle.Common</RootNamespace>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AssemblyName>Xamarin.Android.Arch.Lifecycle.Common</AssemblyName>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <!-- <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
+    <AndroidClassParser>class-parse</AndroidClassParser>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!--Docs URL Can be found here: http://dl-ssl.google.com/android/repository/repository-8.xml -->
+    <DroidDocPaths>..\..\docs\reference</DroidDocPaths>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Additions\Additions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+    <TransformFile Include="Transforms\Metadata.xml" />
+    <TransformFile Include="..\..\..\Metadata.generated.xml">
+      <Link>Transforms\Metadata.generated.xml</Link>
+    </TransformFile>
+    <TransformFile Include="..\..\..\Metadata.common.xml">
+      <Link>Transforms\Metadata.common.xml</Link>
+    </TransformFile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Additions\" />
+    <Folder Include="Jars\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedJar Include="..\..\..\externals\arch-lifecycle\arch-lifecycle-common.jar">
+      <Link>arch-lifecycle-common.jar</Link>
+    </EmbeddedJar>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+  
+</Project>
diff --git a/arch-lifecycle/common/source/Properties/AssemblyInfo.cs b/arch-lifecycle/common/source/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..4b513b49
--- /dev/null
+++ b/arch-lifecycle/common/source/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Xamarin.Android.Arch.Lifecycle.Common")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany ("Microsoft Corporation")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/arch-lifecycle/common/source/Transforms/EnumFields.xml b/arch-lifecycle/common/source/Transforms/EnumFields.xml
new file mode 100644
index 00000000..81f1dc4a
--- /dev/null
+++ b/arch-lifecycle/common/source/Transforms/EnumFields.xml
@@ -0,0 +1,3 @@
+<enum-field-mappings>
+</enum-field-mappings>
+ 
\ No newline at end of file
diff --git a/arch-lifecycle/common/source/Transforms/EnumMethods.xml b/arch-lifecycle/common/source/Transforms/EnumMethods.xml
new file mode 100644
index 00000000..818878c9
--- /dev/null
+++ b/arch-lifecycle/common/source/Transforms/EnumMethods.xml
@@ -0,0 +1,2 @@
+<enum-method-mappings>
+</enum-method-mappings>
diff --git a/arch-lifecycle/common/source/Transforms/Metadata.xml b/arch-lifecycle/common/source/Transforms/Metadata.xml
new file mode 100644
index 00000000..042ef0a6
--- /dev/null
+++ b/arch-lifecycle/common/source/Transforms/Metadata.xml
@@ -0,0 +1,3 @@
+<metadata>
+	<remove-node path="/api/package[@name='android.arch.lifecycle']/*[@name='OnLifecycleEvent']" />
+</metadata>
\ No newline at end of file
diff --git a/arch-lifecycle/runtime/nuget/template.nuspec b/arch-lifecycle/runtime/nuget/template.nuspec
new file mode 100644
index 00000000..9ef0d4c8
--- /dev/null
+++ b/arch-lifecycle/runtime/nuget/template.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Xamarin.Android.Arch.Lifecycle.Runtime</id>
+    <title>Xamarin Android Architecture Lifecycle - Runtime</title>
+    <version>$version$</version>
+    <authors>Xamarin Inc.</authors>
+    <owners>Xamarin Inc.</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>Android Architecture Lifecycle - Runtime C# bindings for Xamarin</description>
+    <copyright>Copyright © Microsoft Corporation</copyright>
+    <projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
+    <licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/arch-lifecycle-runtime_128x128.png</iconUrl>
+    <dependencies>
+      <group targetFramework="MonoAndroid80">
+        <dependency id="Xamarin.Android.Support.Annotations" version="26.1.0"/>
+        <dependency id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.1" />
+        <dependency id="Xamarin.Android.Arch.Core.Common" version="1.0.0" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="arch-lifecycle/runtime/nuget/Xamarin.Android.Arch.Lifecycle.Runtime.targets" target="build/MonoAndroid80" />
+
+    <file src="output/Xamarin.Android.Arch.Lifecycle.Runtime.dll" target="lib/MonoAndroid80" />
+
+    <file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
+  </files>
+</package>
diff --git a/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj b/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj
new file mode 100644
index 00000000..34892840
--- /dev/null
+++ b/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{25CE44A9-FA51-4468-952F-21A13F066384}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Android.Arch.Lifecycle.Runtime</RootNamespace>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AssemblyName>Xamarin.Android.Arch.Lifecycle.Runtime</AssemblyName>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <!-- <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
+    <AndroidClassParser>class-parse</AndroidClassParser>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!--Docs URL Can be found here: http://dl-ssl.google.com/android/repository/repository-8.xml -->
+    <DroidDocPaths>..\..\docs\reference</DroidDocPaths>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+    <TransformFile Include="Transforms\Metadata.xml" />
+    <TransformFile Include="..\..\..\Metadata.generated.xml">
+      <Link>Transforms\Metadata.generated.xml</Link>
+    </TransformFile>
+    <TransformFile Include="..\..\..\Metadata.common.xml">
+      <Link>Transforms\Metadata.common.xml</Link>
+    </TransformFile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Additions\" />
+    <Folder Include="Jars\" />
+  </ItemGroup>
+  <ItemGroup>
+    <LibraryProjectZip Include="..\..\..\externals\arch-lifecycle\arch-lifecycle-runtime.aar">
+      <Link>arch-lifecycle-runtime.aar</Link>
+    </LibraryProjectZip>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+  
+</Project>
diff --git a/arch-lifecycle/runtime/source/Properties/AssemblyInfo.cs b/arch-lifecycle/runtime/source/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..90f64eaa
--- /dev/null
+++ b/arch-lifecycle/runtime/source/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Xamarin.Android.Arch.Lifecycle.Runtime")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany ("Microsoft Corporation")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/arch-lifecycle/runtime/source/Transforms/EnumFields.xml b/arch-lifecycle/runtime/source/Transforms/EnumFields.xml
new file mode 100644
index 00000000..81f1dc4a
--- /dev/null
+++ b/arch-lifecycle/runtime/source/Transforms/EnumFields.xml
@@ -0,0 +1,3 @@
+<enum-field-mappings>
+</enum-field-mappings>
+ 
\ No newline at end of file
diff --git a/arch-lifecycle/runtime/source/Transforms/EnumMethods.xml b/arch-lifecycle/runtime/source/Transforms/EnumMethods.xml
new file mode 100644
index 00000000..818878c9
--- /dev/null
+++ b/arch-lifecycle/runtime/source/Transforms/EnumMethods.xml
@@ -0,0 +1,2 @@
+<enum-method-mappings>
+</enum-method-mappings>
diff --git a/arch-lifecycle/runtime/source/Transforms/Metadata.xml b/arch-lifecycle/runtime/source/Transforms/Metadata.xml
new file mode 100644
index 00000000..a796276b
--- /dev/null
+++ b/arch-lifecycle/runtime/source/Transforms/Metadata.xml
@@ -0,0 +1,5 @@
+<metadata>
+	<remove-node path="/api/package[@name='android.arch.lifecycle']/interface[@name='LifecycleRegistryOwner']" />
+
+	<remove-node path="/api/package[@name='android.arch.lifecycle']/interface[@name='ReportFragment.ActivityInitializationListener']" />
+</metadata>
\ No newline at end of file
diff --git a/build.cake b/build.cake
index a560a2e7..b319285e 100644
--- a/build.cake
+++ b/build.cake
@@ -14,12 +14,16 @@ var BUILD_CONFIG = Argument ("config", "Release");
 // Master list of all the packages in the repo:
 // https://dl.google.com/dl/android/maven2/master-index.xml
 
-var NUGET_VERSION = "26.0.2";
-var COMPONENT_VERSION = "26.0.2.0";
-var AAR_VERSION = "26.0.2";
-var DOC_VERSION = "2017-09-05";
+var NUGET_VERSION = "26.1.0";
+var COMPONENT_VERSION = "26.1.0.0";
+var AAR_VERSION = "26.1.0";
+var DOC_VERSION = "2017-10-02";
+
+
 
 var SUPPORT_PKG_NAME = "com.android.support";
+var ARCH_LIFECYCLE_PKG_NAME = "android.arch.lifecycle";
+var ARCH_CORE_PKG_NAME = "android.arch.core";
 
 // FROM: https://dl.google.com/android/repository/addon2-1.xml
 var MAVEN_REPO_URL = "https://dl.google.com/dl/android/maven2/";
@@ -38,6 +42,10 @@ if (!IsRunningOnWindows())
 	CPU_COUNT = 1;
 
 var ARTIFACTS = new [] {
+	new ArtifactInfo (ARCH_CORE_PKG_NAME, "common", "Xamarin.Android.Arch.Core.Common", "1.0.0", "1.0.0", "1.0.0.0", true) { PathPrefix = "arch-core/" },
+	new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "common", "Xamarin.Android.Arch.Lifecycle.Common", "1.0.1", "1.0.1", "1.0.1.0", true) { PathPrefix = "arch-lifecycle/" },
+	new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "runtime", "Xamarin.Android.Arch.Lifecycle.Runtime", "1.0.0", "1.0.0", "1.0.0.0") { PathPrefix = "arch-lifecycle/" },
+
 	//new ArtifactInfo (SUPPORT_PKG_NAME, "support-v4", "Xamarin.Android.Support.v4", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
 	new ArtifactInfo (SUPPORT_PKG_NAME, "support-v13", "Xamarin.Android.Support.v13", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
 	new ArtifactInfo (SUPPORT_PKG_NAME, "appcompat-v7", "Xamarin.Android.Support.v7.AppCompat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
@@ -102,6 +110,7 @@ class ArtifactInfo
 	public string NuGetVersion { get; set; }
 	public string ComponentVersion { get; set; }
 	public bool IsJar { get; set; }
+	public string PathPrefix { get;set; }
 }
 
 var MONODROID_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions/Current/lib/mandroid/platforms/" + ANDROID_SDK_VERSION + "/";
@@ -119,7 +128,7 @@ if (IsRunningOnWindows ()) {
 		MSCORLIB_PATH = MakeAbsolute (DOTNETDIR.Combine("Framework/v4.0.30319/")).FullPath;
 }
 
-var nugetInfos = ARTIFACTS.Select (a => new NuGetInfo { NuSpec = "./" + a.ArtifactId + "/nuget/" + a.NugetId + ".nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true }).ToList ();
+var nugetInfos = ARTIFACTS.Select (a => new NuGetInfo { NuSpec = "./" + a.PathPrefix + a.ArtifactId + "/nuget/" + a.NugetId + ".nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true }).ToList ();
 nugetInfos.Add (new NuGetInfo { NuSpec = "./support-v4/nuget/Xamarin.Android.Support.v4.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true });
 
 var buildSpec = new BuildSpec {
@@ -130,7 +139,7 @@ var buildSpec = new BuildSpec {
 			MaxCpuCount = CPU_COUNT,
 			AlwaysUseMSBuild = USE_MSBUILD_ON_MAC,
 			Verbosity = Cake.Core.Diagnostics.Verbosity.Diagnostic,
-			OutputFiles = ARTIFACTS.Select (a => new OutputFileCopy { FromFile = "./" + a.ArtifactId + "/source/bin/" + BUILD_CONFIG + "/" + a.NugetId + ".dll" }).ToArray (),
+			OutputFiles = ARTIFACTS.Select (a => new OutputFileCopy { FromFile = "./" + a.PathPrefix + a.ArtifactId + "/source/bin/" + BUILD_CONFIG + "/" + a.NugetId + ".dll" }).ToArray (),
 		}
 	},
 
@@ -186,9 +195,9 @@ if (!string.IsNullOrEmpty (NUGET_SOURCES))
 // ######################################################
 
 Task ("externals")
-	.IsDependentOn ("externals-base")
-	.IsDependentOn ("droiddocs")
 	.WithCriteria (() => !FileExists ("./externals/support-v4/classes.jar"))
+	.IsDependentOn ("droiddocs")
+	.IsDependentOn ("externals-base")
 	.Does (() =>
 {
 	var path = "./externals/";
@@ -202,11 +211,13 @@ Task ("externals")
 		if (art.ArtifactId == "renderscript-v8")
 			continue;
 
-		var localArtifact = "./externals/" + art.ArtifactId + (art.IsJar ? ".jar" : ".aar");
+		var localArtifact = new FilePath ("./externals/"  + art.PathPrefix + art.ArtifactId + (art.IsJar ? ".jar" : ".aar"));
 		var artifactUrl = MAVEN_REPO_URL + art.Package.Replace (".", "/") + "/" + art.ArtifactId + "/" + art.ArtifactVersion + "/" + art.ArtifactId + "-" + art.ArtifactVersion + (art.IsJar ? ".jar" : ".aar");
 
-		if (!FileExists (localArtifact))
+		if (!FileExists (localArtifact)) {
+			EnsureDirectoryExists (localArtifact.GetDirectory ());
 			DownloadFile (artifactUrl, localArtifact);
+		}
 
 		// Open and fix .aar files
 		if (!art.IsJar) {
@@ -215,8 +226,8 @@ Task ("externals")
 			FixAndroidAarFile(localArtifact, art.ArtifactId, true, true);
 
 			// Only unzip if it doesn't exist
-			if (!DirectoryExists("./externals/" + art.ArtifactId))
-				Unzip (localArtifact, "./externals/" + art.ArtifactId);
+			if (!DirectoryExists("./externals/" + art.PathPrefix + art.ArtifactId))
+				Unzip (localArtifact, "./externals/" + art.PathPrefix + art.ArtifactId);
 		}
 	}
 
@@ -233,6 +244,11 @@ Task ("externals")
 	var supportV4ArtifactUrl = MAVEN_REPO_URL + SUPPORT_PKG_NAME.Replace (".", "/") + "/support-v4/" + AAR_VERSION + "/support-v4-" + AAR_VERSION + ".aar";
 	DownloadFile (supportV4ArtifactUrl, "./externals/support-v4.aar");
 	Unzip ("./externals/support-v4.aar", "./externals/support-v4");
+
+	// Fix naming for some of the arch libraries that have duplicate names of each other
+	MoveFile ("./externals/arch-core/common.jar", "./externals/arch-core/arch-core-common.jar");
+	MoveFile ("./externals/arch-lifecycle/common.jar", "./externals/arch-lifecycle/arch-lifecycle-common.jar");
+	MoveFile ("./externals/arch-lifecycle/runtime.aar", "./externals/arch-lifecycle/arch-lifecycle-runtime.aar");
 });
 
 Task ("diff")
@@ -301,7 +317,9 @@ Task ("component-setup").Does (() =>
 });
 
 
-Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
+Task ("nuget-setup")
+	.IsDependentOn ("externals")
+	.IsDependentOn ("buildtasks")
 	.Does (() => 
 {
 
@@ -326,10 +344,10 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
 
 	foreach (var art in nugetArtifacts) {
 
-		var proguardFile = new FilePath(string.Format("./externals/{0}/proguard.txt", art.ArtifactId));
+		var proguardFile = new FilePath(string.Format("./externals/{0}/proguard.txt", art.PathPrefix + art.ArtifactId));
 
 		var targetsText = templateText;
-		var targetsFile = new FilePath(string.Format ("{0}/nuget/{1}.targets", art.ArtifactId, art.NugetId));
+		var targetsFile = new FilePath(string.Format ("{0}/nuget/{1}.targets", art.PathPrefix + art.ArtifactId, art.NugetId));
 		FileWriteText (targetsFile, targetsText);
 
 		// Transform all .targets files
@@ -353,7 +371,7 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
 		// nuget only allows one automatic .targets file in the build/ folder
 		// of the nuget package, which must be named {nuget-package-id}.targets
 		// so we need to merge them all into one
-		var mergeFile = new FilePath (art.ArtifactId + "/nuget/merge.targets");
+		var mergeFile = new FilePath (art.PathPrefix + art.ArtifactId + "/nuget/merge.targets");
 
 		if (FileExists (mergeFile)) {
 			Information ("merge.targets found, merging into generated file...");
@@ -362,9 +380,9 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
 
 		
 		// Transform all template.nuspec files
-		var nuspecText = FileReadText(art.ArtifactId + "/nuget/template.nuspec");
+		var nuspecText = FileReadText(art.PathPrefix + art.ArtifactId + "/nuget/template.nuspec");
 		//nuspecText = nuspecText.Replace ("$xbdversion$", XBD_VERSION);
-		var nuspecFile = new FilePath(art.ArtifactId + "/nuget/" + art.NugetId + ".nuspec");
+		var nuspecFile = new FilePath(art.PathPrefix + art.ArtifactId + "/nuget/" + art.NugetId + ".nuspec");
 		FileWriteText(nuspecFile, nuspecText);
 		var xNuspec = System.Xml.Linq.XDocument.Load (MakeAbsolute(nuspecFile).FullPath);
 		System.Xml.Linq.XNamespace nsNuspec = xNuspec.Root.Name.Namespace;
@@ -386,12 +404,24 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
 	}
 });
 
-Task ("nuget").IsDependentOn ("nuget-setup").IsDependentOn ("nuget-base").IsDependentOn ("libs");
+Task ("nuget")
+	.IsDependentOn ("libs")
+	.IsDependentOn ("nuget-setup")
+	.IsDependentOn ("nuget-base");
 
+Task ("ci")
+	.IsDependentOn ("diff")
+	.IsDependentOn ("component");
 
-Task ("component").IsDependentOn ("component-docs").IsDependentOn ("component-setup").IsDependentOn ("component-base").IsDependentOn ("libs");
+Task ("component")
+	.IsDependentOn ("libs")
+	.IsDependentOn ("component-docs")
+	.IsDependentOn ("component-setup")
+	.IsDependentOn ("component-base");
 
-Task ("clean").IsDependentOn ("clean-base").Does (() =>
+Task ("clean")
+	.IsDependentOn ("clean-base")
+	.Does (() =>
 {
 	if (FileExists ("./generated.targets"))
 		DeleteFile ("./generated.targets");
@@ -470,12 +500,16 @@ Task ("component-docs").Does (() =>
 	}
 });
 
-//Task ("libs").IsDependentOn ("nuget-setup").IsDependentOn ("genapi").IsDependentOn ("libs-base");
-Task ("libs").IsDependentOn("buildtasks").IsDependentOn ("genapi").IsDependentOn ("libs-base");
-//Task ("libs").IsDependentOn ("libs-base");
-
-Task ("genapi").IsDependentOn ("libs-base").IsDependentOn ("externals").Does (() => {
+Task ("libs")
+	.IsDependentOn ("buildtasks")
+	.IsDependentOn ("genapi")
+	.IsDependentOn ("libs-base");
 
+Task ("genapi")
+	.IsDependentOn ("externals")
+	.IsDependentOn ("libs-base")
+	.Does (() => 
+{
 	var GenApiToolPath = GetFiles ("./tools/**/GenAPI.exe").FirstOrDefault ();
 
 	// For some reason GenAPI.exe can't handle absolute paths on mac/unix properly, so always make them relative
@@ -522,7 +556,7 @@ Task ("buildtasks").Does (() =>
 });
 
 
-Task ("droiddocs").Does(() => 
+Task ("droiddocs").Does (() => 
 {
 	EnsureDirectoryExists("./output");
 
diff --git a/cardview-v7/source/V7-CardView.csproj b/cardview-v7/source/V7-CardView.csproj
index 85762134..0c8165f2 100644
--- a/cardview-v7/source/V7-CardView.csproj
+++ b/cardview-v7/source/V7-CardView.csproj
@@ -73,6 +73,12 @@
       <Link>cardview-v7.aar</Link>
     </LibraryProjectZip>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <DroidDocPaths>..\..\docs\reference</DroidDocPaths>
   </PropertyGroup>
diff --git a/constraint-layout-solver/source/ConstraintLayoutSolver.csproj b/constraint-layout-solver/source/ConstraintLayoutSolver.csproj
index e6b286a1..527ece28 100644
--- a/constraint-layout-solver/source/ConstraintLayoutSolver.csproj
+++ b/constraint-layout-solver/source/ConstraintLayoutSolver.csproj
@@ -52,11 +52,12 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
+    <Folder Include="Jars\" />
   </ItemGroup>
   <ItemGroup>
-    <InputJar Include="..\..\externals\solver\constraint-layout-solver-1.0.2.jar">
-      <Link>Jars\constraint-layout-solver.jar</Link>
-    </InputJar>
+    <EmbeddedJar Include="..\..\externals\constraint-layout-solver.jar">
+      <Link>constraint-layout-solver.jar</Link>
+    </EmbeddedJar>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
\ No newline at end of file
diff --git a/constraint-layout-solver/source/Properties/AssemblyInfo.cs b/constraint-layout-solver/source/Properties/AssemblyInfo.cs
index eeb9cbef..fdf5d94e 100644
--- a/constraint-layout-solver/source/Properties/AssemblyInfo.cs
+++ b/constraint-layout-solver/source/Properties/AssemblyInfo.cs
@@ -18,34 +18,4 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
-[assembly: Java.Interop.JavaLibraryReference (__Consts.JarPath,
-    PackageName = __Consts.PackageName,
-    SourceUrl = __Consts.Url,
-    //EmbeddedArchive = __Consts.JarPath,
-    Version = __Consts.Version,
-    Sha1sum = __Consts.Sha1sum)]
-
-//[assembly: Android.IncludeAndroidResourcesFromAttribute ("./",
-//    PackageName = __Consts.PackageName,
-//    SourceUrl = __Consts.Url,
-//    EmbeddedArchive = __Consts.AarPath,
-//    Version = __Consts.Version,
-//    Sha1sum = __Consts.Sha1sum)]
-
-static class __Consts
-{
-    public const string JarPath = "solver/constraint-layout-solver-" + JarVersion + ".jar";
-    public const string JarVersion = "1.0.0-alpha9";
-    public const string Version = JarVersion;
-    public const string PackageName = "Xamarin.Android.Support.Constraint.Layout.Solver";
-    public const string Url = "https://dl-ssl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-" + JarVersion + ".zip";
-    public const string Sha1sum = "2c52ddd883d83230a17042b8f4ba03669f0f5f40";
-}
+[assembly: AssemblyVersion ("1.1.0.0")]
diff --git a/constraint-layout/build.cake b/constraint-layout/build.cake
index b61c3648..f9537340 100644
--- a/constraint-layout/build.cake
+++ b/constraint-layout/build.cake
@@ -6,11 +6,11 @@
 var TARGET = Argument ("target", Argument ("t", "Default"));
 
 
-var NUGET_VERSION = "1.0.2";
+var NUGET_VERSION = "1.0.2.2";
 var AAR_VERSION = "1.0.2";
 
-var CONSTRAINT_LAYOUT_URL = string.Format ("https://dl-ssl.google.com/android/repository/com.android.support.constraint-constraint-layout-{0}.zip", AAR_VERSION);
-var CONSTRAINT_LAYOUT_SOLVER_URL = string.Format ("https://dl-ssl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-{0}.zip", AAR_VERSION);
+var CONSTRAINT_LAYOUT_URL = string.Format ("https://dl.google.com/dl/android/maven2/com/android/support/constraint/constraint-layout/{0}/constraint-layout-{0}.aar", AAR_VERSION);
+var CONSTRAINT_LAYOUT_SOLVER_URL = string.Format ("https://dl.google.com/dl/android/maven2/com/android/support/constraint/constraint-layout-solver/{0}/constraint-layout-solver-{0}.jar", AAR_VERSION);
 
 
 var buildSpec = new BuildSpec {
@@ -43,17 +43,10 @@ Task ("externals")
 
 	EnsureDirectoryExists (path);
 
-	// Get the actual .aar files and extract
-	if (!FileExists (path + "constraintlayout.zip"))
-		DownloadFile (CONSTRAINT_LAYOUT_URL, path + "constraintlayout.zip");
-	if (!FileExists (path + "constraintlayout/source.properties"))
-		Unzip(path + "constraintlayout.zip", path);
-	Unzip (path + "constraintlayout/constraint-layout-" + AAR_VERSION + ".aar", path + "constraintlayout/");
-
-	if (!FileExists (path + "constraintlayoutsolver.zip"))
-		DownloadFile (CONSTRAINT_LAYOUT_SOLVER_URL, path + "constraintlayoutsolver.zip");
-	if (!FileExists (path + "solver/source.properties"))
-		Unzip(path + "constraintlayoutsolver.zip", path);
+	if (!FileExists (path + "constraint-layout.aar"))
+		DownloadFile (CONSTRAINT_LAYOUT_URL, path + "constraint-layout.aar");
+	if (!FileExists (path + "constraint-layout-solver.jar"))
+		DownloadFile (CONSTRAINT_LAYOUT_SOLVER_URL, path + "constraint-layout-solver.jar");
 });
 
 Task ("clean").IsDependentOn ("clean-base").Does (() => 
diff --git a/constraint-layout/nuget/Xamarin.Android.Support.Constraint.Layout.nuspec b/constraint-layout/nuget/Xamarin.Android.Support.Constraint.Layout.nuspec
index bb9fcd69..502be2f7 100644
--- a/constraint-layout/nuget/Xamarin.Android.Support.Constraint.Layout.nuspec
+++ b/constraint-layout/nuget/Xamarin.Android.Support.Constraint.Layout.nuspec
@@ -18,5 +18,7 @@
   </metadata>
   <files>
     <file src="output/Xamarin.Android.Support.Constraint.Layout.dll" target="lib/MonoAndroid70" />
+
+    <file src="../External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
   </files>
 </package>
diff --git a/constraint-layout/source/ConstraintLayout.csproj b/constraint-layout/source/ConstraintLayout.csproj
index 7a23e3f9..f99cf4ca 100644
--- a/constraint-layout/source/ConstraintLayout.csproj
+++ b/constraint-layout/source/ConstraintLayout.csproj
@@ -52,6 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
+    <Folder Include="Jars\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\constraint-layout-solver\source\ConstraintLayoutSolver.csproj">
@@ -60,9 +61,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <InputJar Include="..\..\externals\constraintlayout\classes.jar">
-      <Link>Jars\constraint-layout-aar.jar</Link>
-    </InputJar>
+    <LibraryProjectZip Include="..\..\externals\constraint-layout.aar">
+      <Link>constraint-layout.aar</Link>
+    </LibraryProjectZip>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
\ No newline at end of file
diff --git a/constraint-layout/source/Properties/AssemblyInfo.cs b/constraint-layout/source/Properties/AssemblyInfo.cs
index e85e82b1..105b5b24 100644
--- a/constraint-layout/source/Properties/AssemblyInfo.cs
+++ b/constraint-layout/source/Properties/AssemblyInfo.cs
@@ -18,34 +18,4 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
-[assembly: Java.Interop.JavaLibraryReference ("classes.jar",
-    PackageName = __Consts.PackageName,
-    SourceUrl = __Consts.Url,
-    EmbeddedArchive = __Consts.AarPath,
-    Version = __Consts.Version,
-    Sha1sum = __Consts.Sha1sum)]
-
-[assembly: Android.IncludeAndroidResourcesFromAttribute ("./",
-    PackageName = __Consts.PackageName,
-    SourceUrl = __Consts.Url,
-    EmbeddedArchive = __Consts.AarPath,
-    Version = __Consts.Version,
-    Sha1sum = __Consts.Sha1sum)]
-
-static class __Consts
-{
-    public const string AarVersion = "1.0.0-alpha9";
-    public const string Version = AarVersion;
-    public const string PackageName = "Xamarin.Android.Support.Constraint.Layout";
-    public const string Url = "https://dl-ssl.google.com/android/repository/com.android.support.constraint-constraint-layout-" + __Consts.AarVersion + ".zip";
-    public const string AarPath = "constraintlayout/constraint-layout-" + __Consts.AarVersion + ".aar";
-    public const string Sha1sum = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4";
-}
+[assembly: AssemblyVersion ("1.1.0.0")]
diff --git a/customtabs/component/component.template.yaml b/customtabs/component/component.template.yaml
index 6092852c..91879785 100644
--- a/customtabs/component/component.template.yaml
+++ b/customtabs/component/component.template.yaml
@@ -19,12 +19,18 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - CustomTabs
     installNuGets:
       - project: ChromeCustomTabsSample
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.CustomTabs
     removeNodes:
       - "//xNS:Import[contains (@Project, 'Xamarin.Android.Support.Tasks.VectorDrawable.targets')]"
diff --git a/customtabs/samples/ChromeCustomTabsSample.sln b/customtabs/samples/ChromeCustomTabsSample.sln
index 8d5d8fbc..566d7c7a 100644
--- a/customtabs/samples/ChromeCustomTabsSample.sln
+++ b/customtabs/samples/ChromeCustomTabsSample.sln
@@ -9,6 +9,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-com
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,5 +37,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj b/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj
index 0b4aec92..dc53cddb 100644
--- a/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj
+++ b/customtabs/samples/ChromeCustomTabsSample/ChromeCustomTabsSample.csproj
@@ -86,5 +86,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/customtabs/source/CustomTabs.csproj b/customtabs/source/CustomTabs.csproj
index 3f54915b..b6a58145 100644
--- a/customtabs/source/CustomTabs.csproj
+++ b/customtabs/source/CustomTabs.csproj
@@ -69,6 +69,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/design/component/component.template.yaml b/design/component/component.template.yaml
index fabc194f..17813497 100644
--- a/design/component/component.template.yaml
+++ b/design/component/component.template.yaml
@@ -20,6 +20,9 @@ samples:
       - Annotations
       - Animated-Vector-Drawable
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -35,6 +38,9 @@ samples:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Animated.Vector.Drawable
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/design/samples/Cheesesquare.sln b/design/samples/Cheesesquare.sln
index 33917c41..e4abb780 100644
--- a/design/samples/Cheesesquare.sln
+++ b/design/samples/Cheesesquare.sln
@@ -29,6 +29,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-CardView", "..\..\cardvi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,5 +97,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/design/samples/Cheesesquare/Cheesesquare.csproj b/design/samples/Cheesesquare/Cheesesquare.csproj
index fc0465fd..161650f3 100644
--- a/design/samples/Cheesesquare/Cheesesquare.csproj
+++ b/design/samples/Cheesesquare/Cheesesquare.csproj
@@ -174,6 +174,18 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/design/source/Design.csproj b/design/source/Design.csproj
index 184f9320..7756a4f7 100644
--- a/design/source/Design.csproj
+++ b/design/source/Design.csproj
@@ -70,10 +70,6 @@
       <Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
       <Name>Core-UI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\support-core-utils\source\Core-Utils.csproj">
-      <Project>{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}</Project>
-      <Name>Core-Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\support-fragment\source\Fragment.csproj">
       <Project>{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}</Project>
       <Name>Fragment</Name>
@@ -94,6 +90,18 @@
       <Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
       <Name>V7-RecyclerView</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/exifinterface/source/Exif.csproj b/exifinterface/source/Exif.csproj
index 9f81dff4..ed64cc30 100644
--- a/exifinterface/source/Exif.csproj
+++ b/exifinterface/source/Exif.csproj
@@ -74,5 +74,11 @@
       <Link>exifinterface.aar</Link>
     </LibraryProjectZip>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/gridlayout-v7/component/component.template.yaml b/gridlayout-v7/component/component.template.yaml
index 23a9bce4..0a4a0bd8 100644
--- a/gridlayout-v7/component/component.template.yaml
+++ b/gridlayout-v7/component/component.template.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - V7-GridLayout
     installNuGets:
@@ -26,6 +29,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.v7.GridLayout
     removeNodes:
diff --git a/gridlayout-v7/samples/AndroidSupportSample.sln b/gridlayout-v7/samples/AndroidSupportSample.sln
index cbf45dbb..86d4cb90 100644
--- a/gridlayout-v7/samples/AndroidSupportSample.sln
+++ b/gridlayout-v7/samples/AndroidSupportSample.sln
@@ -13,6 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-UI", "..\..\support-co
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,5 +49,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 6d51f010..975cdff6 100644
--- a/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/gridlayout-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -97,5 +97,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/gridlayout-v7/source/V7-GridLayout.csproj b/gridlayout-v7/source/V7-GridLayout.csproj
index 4b1ad671..4e374afb 100644
--- a/gridlayout-v7/source/V7-GridLayout.csproj
+++ b/gridlayout-v7/source/V7-GridLayout.csproj
@@ -74,6 +74,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/leanback-v17/component/component.template.yaml b/leanback-v17/component/component.template.yaml
index c1f65281..465f7b45 100644
--- a/leanback-v17/component/component.template.yaml
+++ b/leanback-v17/component/component.template.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -30,6 +33,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/leanback-v17/samples/AndroidSupportSample.sln b/leanback-v17/samples/AndroidSupportSample.sln
index 2c36548b..c3477555 100644
--- a/leanback-v17/samples/AndroidSupportSample.sln
+++ b/leanback-v17/samples/AndroidSupportSample.sln
@@ -21,6 +21,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\re
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,5 +73,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj b/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj
index fb78dd0b..9f2f9484 100644
--- a/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/leanback-v17/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -114,5 +114,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/leanback-v17/source/V17-Leanback.csproj b/leanback-v17/source/V17-Leanback.csproj
index 77e0d68c..6f36b325 100644
--- a/leanback-v17/source/V17-Leanback.csproj
+++ b/leanback-v17/source/V17-Leanback.csproj
@@ -98,6 +98,22 @@
       <Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
       <Name>V7-RecyclerView</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/mediarouter-v7/component/component.template.yaml b/mediarouter-v7/component/component.template.yaml
index 81924ada..576d20d1 100644
--- a/mediarouter-v7/component/component.template.yaml
+++ b/mediarouter-v7/component/component.template.yaml
@@ -21,6 +21,9 @@ samples:
       - Vector-Drawable
       - Animated-Vector-Drawable
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -35,6 +38,9 @@ samples:
           - Xamarin.Android.Support.Vector.Drawable
           - Xamarin.Android.Support.Animated.Vector.Drawable
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/mediarouter-v7/samples/AndroidSupportSample.sln b/mediarouter-v7/samples/AndroidSupportSample.sln
index 996cbae1..c97e473c 100644
--- a/mediarouter-v7/samples/AndroidSupportSample.sln
+++ b/mediarouter-v7/samples/AndroidSupportSample.sln
@@ -27,6 +27,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appco
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,5 +91,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
index ddfaaaa5..79843c34 100644
--- a/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/mediarouter-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -123,6 +123,18 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/mediarouter-v7/source/V7-MediaRouter.csproj b/mediarouter-v7/source/V7-MediaRouter.csproj
index fef5a6b8..cefc267b 100644
--- a/mediarouter-v7/source/V7-MediaRouter.csproj
+++ b/mediarouter-v7/source/V7-MediaRouter.csproj
@@ -94,6 +94,22 @@
       <Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
       <Name>Media-Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/palette-v7/component/component.template.yaml b/palette-v7/component/component.template.yaml
index 66e3a23a..587624ba 100644
--- a/palette-v7/component/component.template.yaml
+++ b/palette-v7/component/component.template.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-Utils
       - V7-Palette
     installNuGets:
@@ -26,6 +29,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.v7.Palette
     removeNodes:
diff --git a/palette-v7/samples/AndroidSupportSample.sln b/palette-v7/samples/AndroidSupportSample.sln
index 773b6056..ea27e03d 100644
--- a/palette-v7/samples/AndroidSupportSample.sln
+++ b/palette-v7/samples/AndroidSupportSample.sln
@@ -13,6 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "..\..\support
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,5 +49,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 65f20b28..94b668fe 100644
--- a/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/palette-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -83,5 +83,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/palette-v7/source/V7-Palette.csproj b/palette-v7/source/V7-Palette.csproj
index d5b3f06b..21750523 100644
--- a/palette-v7/source/V7-Palette.csproj
+++ b/palette-v7/source/V7-Palette.csproj
@@ -79,6 +79,22 @@
       <Project>{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}</Project>
       <Name>Core-Utils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/percent/component/component.template.yaml b/percent/component/component.template.yaml
index 2a649faa..90058a0e 100644
--- a/percent/component/component.template.yaml
+++ b/percent/component/component.template.yaml
@@ -19,12 +19,18 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Percent
     installNuGets:
       - project: AndroidSupportSample
         packages:
           - Xamarin.Android.Support.Annotations 
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Percent
     removeNodes:
       - "//xNS:Import[contains (@Project, 'Xamarin.Android.Support.Tasks.VectorDrawable.targets')]"
diff --git a/percent/samples/AndroidSupportSample.sln b/percent/samples/AndroidSupportSample.sln
index ecde6515..8b191072 100644
--- a/percent/samples/AndroidSupportSample.sln
+++ b/percent/samples/AndroidSupportSample.sln
@@ -11,6 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-com
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,5 +43,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj b/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj
index be99eeb7..24480b00 100644
--- a/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/percent/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -80,5 +80,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/percent/source/Percent.csproj b/percent/source/Percent.csproj
index bd3b5800..5bbe92d4 100644
--- a/percent/source/Percent.csproj
+++ b/percent/source/Percent.csproj
@@ -66,6 +66,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/preference-leanback-v17/source/V17-Preference-Leanback.csproj b/preference-leanback-v17/source/V17-Preference-Leanback.csproj
index 00b72856..3e461d24 100644
--- a/preference-leanback-v17/source/V17-Preference-Leanback.csproj
+++ b/preference-leanback-v17/source/V17-Preference-Leanback.csproj
@@ -120,6 +120,22 @@
       <Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
       <Name>V7-RecyclerView</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   
diff --git a/preference-v14/source/V14-Preference.csproj b/preference-v14/source/V14-Preference.csproj
index 381c5141..9a41c77a 100644
--- a/preference-v14/source/V14-Preference.csproj
+++ b/preference-v14/source/V14-Preference.csproj
@@ -96,6 +96,22 @@
       <Project>{A419C738-BD3D-4460-97E9-B8E44FC26896}</Project>
       <Name>V7-Preference</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/preference-v7/component/component.template.yaml b/preference-v7/component/component.template.yaml
index 6a58aad0..5e1e91b0 100644
--- a/preference-v7/component/component.template.yaml
+++ b/preference-v7/component/component.template.yaml
@@ -27,6 +27,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -44,6 +47,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/preference-v7/samples/AndroidSupportSample.sln b/preference-v7/samples/AndroidSupportSample.sln
index edd418cf..a56d8f88 100644
--- a/preference-v7/samples/AndroidSupportSample.sln
+++ b/preference-v7/samples/AndroidSupportSample.sln
@@ -33,6 +33,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Preference-Leanback", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -103,5 +109,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
index e7366822..4744ce8f 100644
--- a/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/preference-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -133,5 +133,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/preference-v7/source/V7-Preference.csproj b/preference-v7/source/V7-Preference.csproj
index 1ecfc85d..1780f60c 100644
--- a/preference-v7/source/V7-Preference.csproj
+++ b/preference-v7/source/V7-Preference.csproj
@@ -88,6 +88,22 @@
       <Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
       <Name>V7-AppCompat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/recommendation/component/component.disabled.yaml b/recommendation/component/component.disabled.yaml
index d540f9bb..575a7970 100644
--- a/recommendation/component/component.disabled.yaml
+++ b/recommendation/component/component.disabled.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -30,6 +33,9 @@ samples:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Recommendation
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/recommendation/samples/AndroidSupportSample.sln b/recommendation/samples/AndroidSupportSample.sln
index 3c431ea6..811619cd 100644
--- a/recommendation/samples/AndroidSupportSample.sln
+++ b/recommendation/samples/AndroidSupportSample.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample.UITest
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recommendation", "..\source\Recommendation.csproj", "{257D3C55-FADE-4C65-9967-7DCDE23F83A8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,5 +27,9 @@ Global
 		{9A0B8B8E-D1E4-4F86-8495-4FE3FAAA4C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A0B8B8E-D1E4-4F86-8495-4FE3FAAA4C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A0B8B8E-D1E4-4F86-8495-4FE3FAAA4C84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj b/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 7e496590..b896372a 100644
--- a/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/recommendation/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -72,5 +72,9 @@
       <Project>{257D3C55-FADE-4C65-9967-7DCDE23F83A8}</Project>
       <Name>Recommendation</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/recommendation/source/Recommendation.csproj b/recommendation/source/Recommendation.csproj
index e046409e..f87bbcf1 100644
--- a/recommendation/source/Recommendation.csproj
+++ b/recommendation/source/Recommendation.csproj
@@ -82,6 +82,22 @@
       <Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
       <Name>Media-Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/recyclerview-v7/component/component.template.yaml b/recyclerview-v7/component/component.template.yaml
index aadc8d0f..c5e44743 100644
--- a/recyclerview-v7/component/component.template.yaml
+++ b/recyclerview-v7/component/component.template.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - V7-RecyclerView
     installNuGets:
@@ -26,6 +29,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.v7.RecyclerView
     removeNodes:
diff --git a/recyclerview-v7/samples/AndroidSupportSample.sln b/recyclerview-v7/samples/AndroidSupportSample.sln
index 6c80f3fc..7ad0c840 100644
--- a/recyclerview-v7/samples/AndroidSupportSample.sln
+++ b/recyclerview-v7/samples/AndroidSupportSample.sln
@@ -13,6 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-UI", "..\..\support-co
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,5 +49,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj b/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 1147765f..aaae67f4 100644
--- a/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/recyclerview-v7/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -82,5 +82,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/recyclerview-v7/source/V7-RecyclerView.csproj b/recyclerview-v7/source/V7-RecyclerView.csproj
index f2593c0a..cbf43062 100644
--- a/recyclerview-v7/source/V7-RecyclerView.csproj
+++ b/recyclerview-v7/source/V7-RecyclerView.csproj
@@ -76,6 +76,22 @@
       <Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
       <Name>Core-UI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/support-compat/nuget/template.nuspec b/support-compat/nuget/template.nuspec
index 7170481e..2ccdf72e 100644
--- a/support-compat/nuget/template.nuspec
+++ b/support-compat/nuget/template.nuspec
@@ -15,6 +15,7 @@
     <dependencies>
       <group targetFramework="MonoAndroid80">
         <dependency id="Xamarin.Android.Support.Annotations" version="[$version$]" />
+        <dependency id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.0" />
       </group>
     </dependencies>
   </metadata>
diff --git a/support-compat/source/Compat.csproj b/support-compat/source/Compat.csproj
index ba1a6612..036e5f93 100644
--- a/support-compat/source/Compat.csproj
+++ b/support-compat/source/Compat.csproj
@@ -82,6 +82,18 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/support-core-ui/source/Core-UI.csproj b/support-core-ui/source/Core-UI.csproj
index 3d9f6c61..58f0e75a 100644
--- a/support-core-ui/source/Core-UI.csproj
+++ b/support-core-ui/source/Core-UI.csproj
@@ -70,6 +70,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/support-core-utils/source/Core-Utils.csproj b/support-core-utils/source/Core-Utils.csproj
index 0a557fab..81b78edb 100644
--- a/support-core-utils/source/Core-Utils.csproj
+++ b/support-core-utils/source/Core-Utils.csproj
@@ -69,6 +69,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/support-dynamic-animation/source/DynamicAnimation.csproj b/support-dynamic-animation/source/DynamicAnimation.csproj
index 23e751a1..b5f85c8c 100644
--- a/support-dynamic-animation/source/DynamicAnimation.csproj
+++ b/support-dynamic-animation/source/DynamicAnimation.csproj
@@ -81,6 +81,26 @@
       <Project>{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}</Project>
       <Name>Core-Utils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-compat\source\Compat.csproj">
+      <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
+      <Name>Compat</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   
diff --git a/support-emoji-appcompat/source/Emoji-AppCompat.csproj b/support-emoji-appcompat/source/Emoji-AppCompat.csproj
index 13b9925d..95ddf448 100644
--- a/support-emoji-appcompat/source/Emoji-AppCompat.csproj
+++ b/support-emoji-appcompat/source/Emoji-AppCompat.csproj
@@ -108,6 +108,22 @@
       <Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
       <Name>Media-Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/support-emoji-bundled/source/Emoji-Bundled.csproj b/support-emoji-bundled/source/Emoji-Bundled.csproj
index f89da47e..7164e4b1 100644
--- a/support-emoji-bundled/source/Emoji-Bundled.csproj
+++ b/support-emoji-bundled/source/Emoji-Bundled.csproj
@@ -80,6 +80,22 @@
       <Project>{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}</Project>
       <Name>Emoji</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/support-emoji/source/Emoji.csproj b/support-emoji/source/Emoji.csproj
index 3f8817ee..b438dbc6 100644
--- a/support-emoji/source/Emoji.csproj
+++ b/support-emoji/source/Emoji.csproj
@@ -76,6 +76,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/support-fragment/nuget/template.nuspec b/support-fragment/nuget/template.nuspec
index 888a4e77..ba5658f5 100644
--- a/support-fragment/nuget/template.nuspec
+++ b/support-fragment/nuget/template.nuspec
@@ -17,7 +17,6 @@
         <dependency id="Xamarin.Android.Support.Compat" version="[$version$]"/>
         <dependency id="Xamarin.Android.Support.Core.UI" version="[$version$]"/>
         <dependency id="Xamarin.Android.Support.Core.Utils" version="[$version$]"/>
-        <dependency id="Xamarin.Android.Support.Media.Compat" version="[$version$]"/>
       </group>
     </dependencies>
   </metadata>
diff --git a/support-fragment/source/Fragment.csproj b/support-fragment/source/Fragment.csproj
index c9729cee..698e3a78 100644
--- a/support-fragment/source/Fragment.csproj
+++ b/support-fragment/source/Fragment.csproj
@@ -74,14 +74,26 @@
       <Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
       <Name>Core-UI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\support-core-utils\source\Core-Utils.csproj">
       <Project>{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}</Project>
       <Name>Core-Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\support-media-compat\source\Media-Compat.csproj">
-      <Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
-      <Name>Media-Compat</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/support-fragment/source/Transforms/Metadata.xml b/support-fragment/source/Transforms/Metadata.xml
index 6eee16a4..bd3ad18a 100644
--- a/support-fragment/source/Transforms/Metadata.xml
+++ b/support-fragment/source/Transforms/Metadata.xml
@@ -9,4 +9,11 @@
 	<remove-node path="/api/package[@name='android.support.v4.app']/class[@name='FragmentActivity']/method[@name='onRequestPermissionsResult' and count(parameter)=3 and parameter[1][@type='int'] and parameter[2][@type='java.lang.String[]'] and parameter[3][@type='int[]']]" />
 
 	<remove-node path="/api/package[@name='android.support.v4.app']/interface[@name='Fragment.OnStartEnterTransitionListener']" />
+
+	<add-node path="/api/package[@name='android.support.v4.app']/class[@name='FragmentActivity']">
+		<implements name="android.arch.lifecycle.LifecycleOwner" name-generic-aware="android.arch.lifecycle.LifecycleOwner">
+		</implements>
+		<method abstract="false" deprecated="not deprecated" final="false" name="getLifecycle" native="false" return="android.arch.lifecycle.Lifecycle" static="false" synchronized="false" visibility="public">
+		</method>
+	</add-node>
 </metadata>
\ No newline at end of file
diff --git a/support-media-compat/source/Media-Compat.csproj b/support-media-compat/source/Media-Compat.csproj
index 240ab842..47dcf8be 100644
--- a/support-media-compat/source/Media-Compat.csproj
+++ b/support-media-compat/source/Media-Compat.csproj
@@ -69,6 +69,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/support-tv-provider/source/TV-Provider.csproj b/support-tv-provider/source/TV-Provider.csproj
index da9245ce..7246ceaf 100644
--- a/support-tv-provider/source/TV-Provider.csproj
+++ b/support-tv-provider/source/TV-Provider.csproj
@@ -69,6 +69,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <LibraryProjectZip Include="..\..\externals\support-tv-provider.aar">
diff --git a/support-v13/component/component.template.yaml b/support-v13/component/component.template.yaml
index 4e2abb8c..b2d8b92f 100644
--- a/support-v13/component/component.template.yaml
+++ b/support-v13/component/component.template.yaml
@@ -19,6 +19,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -29,6 +32,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/support-v13/samples/AndroidSupportSample.sln b/support-v13/samples/AndroidSupportSample.sln
index 7881b1cd..2a12cf8c 100644
--- a/support-v13/samples/AndroidSupportSample.sln
+++ b/support-v13/samples/AndroidSupportSample.sln
@@ -19,6 +19,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\suppo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,5 +67,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj b/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 8c834d8e..546d432f 100644
--- a/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/support-v13/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -101,5 +101,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/support-v13/source/V13.csproj b/support-v13/source/V13.csproj
index ef90a81d..ea551eb3 100644
--- a/support-v13/source/V13.csproj
+++ b/support-v13/source/V13.csproj
@@ -79,10 +79,6 @@
       <Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
       <Name>Core-UI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\support-core-utils\source\Core-Utils.csproj">
-      <Project>{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}</Project>
-      <Name>Core-Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\support-fragment\source\Fragment.csproj">
       <Project>{2DE9FDA4-3F63-49E2-BD45-5C072A0350D8}</Project>
       <Name>Fragment</Name>
@@ -91,6 +87,22 @@
       <Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
       <Name>Media-Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <LibraryProjectZip Include="..\..\externals\support-v13.aar">
diff --git a/support-v4/samples/AndroidSupportSample.sln b/support-v4/samples/AndroidSupportSample.sln
index da394322..5f1d846c 100644
--- a/support-v4/samples/AndroidSupportSample.sln
+++ b/support-v4/samples/AndroidSupportSample.sln
@@ -19,6 +19,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\suppo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,5 +67,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj b/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj
index 3b39ab4f..3dc56071 100644
--- a/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj
+++ b/support-v4/samples/AndroidSupportSample/AndroidSupportSample.csproj
@@ -101,5 +101,17 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/support-vector-drawable/component/component.template.yaml b/support-vector-drawable/component/component.template.yaml
index 331a081c..c97e49a9 100644
--- a/support-vector-drawable/component/component.template.yaml
+++ b/support-vector-drawable/component/component.template.yaml
@@ -20,6 +20,9 @@ samples:
     removeProjects:
       - Annotations
       - Compat
+      - Arch.Core.Common
+      - Arch.Lifecycle.Common
+      - Arch.Lifecycle.Runtime
       - Core-UI
       - Core-Utils
       - Fragment
@@ -32,6 +35,9 @@ samples:
         packages:
           - Xamarin.Android.Support.Annotations
           - Xamarin.Android.Support.Compat
+          - Xamarin.Android.Arch.Core.Common
+          - Xamarin.Android.Arch.Lifecycle.Common
+          - Xamarin.Android.Arch.Lifecycle.Runtime
           - Xamarin.Android.Support.Core.UI
           - Xamarin.Android.Support.Core.Utils
           - Xamarin.Android.Support.Fragment
diff --git a/support-vector-drawable/samples/VectorDrawableSample.sln b/support-vector-drawable/samples/VectorDrawableSample.sln
index f6c293e3..3a883ae5 100644
--- a/support-vector-drawable/samples/VectorDrawableSample.sln
+++ b/support-vector-drawable/samples/VectorDrawableSample.sln
@@ -21,6 +21,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appco
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "..\..\support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Common", "..\..\arch-core\common\source\Arch.Core.Common.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13870}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Common", "..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj", "{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj", "{25CE44A9-FA51-4468-952F-21A13F066384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,5 +73,17 @@ Global
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C9E1C1E-09C3-469C-B3C2-79651DF13870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25CE44A9-FA51-4468-952F-21A13F066384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj b/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj
index fcff9218..b3f6aaa1 100644
--- a/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj
+++ b/support-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj
@@ -104,6 +104,18 @@
       <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
       <Name>Annotations</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/support-vector-drawable/source/Vector-Drawable.csproj b/support-vector-drawable/source/Vector-Drawable.csproj
index 1fc9dda1..6b73cb28 100644
--- a/support-vector-drawable/source/Vector-Drawable.csproj
+++ b/support-vector-drawable/source/Vector-Drawable.csproj
@@ -76,6 +76,22 @@
       <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
       <Name>Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj b/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj
index 6b256853..025cd67e 100644
--- a/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj
+++ b/tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj
@@ -152,6 +152,15 @@
 		<Reference Include="Xamarin.Android.Support.Wear">
       <HintPath>..\..\output\Xamarin.Android.Support.Wear.dll</HintPath>
     </Reference>
+		<Reference Include="Xamarin.Android.Arch.Core.Common">
+		  <HintPath>..\..\output\Xamarin.Android.Arch.Core.Common.dll</HintPath>
+		</Reference>
+		<Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
+		  <HintPath>..\..\output\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
+		</Reference>
+		<Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
+		  <HintPath>..\..\output\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
+		</Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/transition/source/Transition.csproj b/transition/source/Transition.csproj
index 9e98f624..b05f3d34 100644
--- a/transition/source/Transition.csproj
+++ b/transition/source/Transition.csproj
@@ -83,6 +83,22 @@
       <Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
       <Name>Media-Compat</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Additions\" />
diff --git a/wear/nuget/template.nuspec b/wear/nuget/template.nuspec
index 0afe5d54..3993925a 100644
--- a/wear/nuget/template.nuspec
+++ b/wear/nuget/template.nuspec
@@ -16,6 +16,8 @@
       <group targetFramework="MonoAndroid80">
         <dependency id="Xamarin.Android.Support.Core.UI" version="[$version$]" />
         <dependency id="Xamarin.Android.Support.Annotations" version="[$version$]" />
+        <dependency id="Xamarin.Android.Support.Percent" version="[$version$]" />
+        <dependency id="Xamarin.Android.Support.v7.RecyclerView" version="[$version$]" />
       </group>
     </dependencies>
   </metadata>
diff --git a/wear/source/Wear.csproj b/wear/source/Wear.csproj
index 5dd05afa..0c8ab1a9 100644
--- a/wear/source/Wear.csproj
+++ b/wear/source/Wear.csproj
@@ -74,6 +74,40 @@
       <Link>wear.aar</Link>
     </LibraryProjectZip>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
+      <Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
+      <Name>Annotations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-core-ui\source\Core-UI.csproj">
+      <Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
+      <Name>Core-UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\percent\source\Percent.csproj">
+      <Project>{A557F298-10FD-4F47-8C96-20387E2AA741}</Project>
+      <Name>Percent</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\recyclerview-v7\source\V7-RecyclerView.csproj">
+      <Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
+      <Name>V7-RecyclerView</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\support-compat\source\Compat.csproj">
+      <Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
+      <Name>Compat</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\runtime\source\Arch.Lifecycle.Runtime.csproj">
+      <Project>{25CE44A9-FA51-4468-952F-21A13F066384}</Project>
+      <Name>Arch.Lifecycle.Runtime</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-lifecycle\common\source\Arch.Lifecycle.Common.csproj">
+      <Project>{1489A4D8-8D13-4113-BD73-3025CDE3E3A0}</Project>
+      <Name>Arch.Lifecycle.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\arch-core\common\source\Arch.Core.Common.csproj">
+      <Project>{4C9E1C1E-09C3-469C-B3C2-79651DF13870}</Project>
+      <Name>Arch.Core.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   
 </Project>