diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/ActivityAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/ActivityAttribute.Partial.cs
index 9d2a2986158..97636b56c9c 100644
--- a/src/Xamarin.Android.Build.Tasks/Mono.Android/ActivityAttribute.Partial.cs
+++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/ActivityAttribute.Partial.cs
@@ -51,6 +51,11 @@ partial class ActivityAttribute {
 			  "configChanges",
 			  self          => self.ConfigurationChanges,
 			  (self, value) => self.ConfigurationChanges  = (ConfigChanges) value
+			}, {
+			  "DirectBootAware",
+			  "directBootAware",
+			  self          => self.DirectBootAware,
+			  (self, value) => self.DirectBootAware = (bool) value
 			}, {
 			  "Enabled",
 			  "enabled",
diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs
index 673fcc2b902..a02b66c4251 100644
--- a/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs
+++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs
@@ -79,6 +79,11 @@ partial class ApplicationAttribute {
 			  "description",
 			  self          => self.Description,
 			  (self, value) => self.Description = (string) value
+			}, {
+			  "DirectBootAware",
+			  "directBootAware",
+			  self          => self.DirectBootAware,
+			  (self, value) => self.DirectBootAware = (bool) value
 			}, {
 			  "Enabled",
 			  "enabled",
diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/ContentProviderAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/ContentProviderAttribute.Partial.cs
index 386eb14f51b..dd6893d935c 100644
--- a/src/Xamarin.Android.Build.Tasks/Mono.Android/ContentProviderAttribute.Partial.cs
+++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/ContentProviderAttribute.Partial.cs
@@ -18,6 +18,11 @@ partial class ContentProviderAttribute {
 			  "authorities",
 			  (self, value) => self.Authorities = ToStringArray (value),
 			  self          => string.Join (";", self.Authorities)
+			}, {
+			  "DirectBootAware",
+			  "directBootAware",
+			  self          => self.DirectBootAware,
+			  (self, value) => self.DirectBootAware = (bool) value
 			}, {
 			  "Enabled",
 			  "enabled",
diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/ServiceAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/ServiceAttribute.Partial.cs
index 668bb12040e..2939d05e6c4 100644
--- a/src/Xamarin.Android.Build.Tasks/Mono.Android/ServiceAttribute.Partial.cs
+++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/ServiceAttribute.Partial.cs
@@ -16,6 +16,11 @@ partial class ServiceAttribute {
 
 		static ManifestDocumentElement<ServiceAttribute> mapping = new ManifestDocumentElement<ServiceAttribute> ("service") {
 			{
+			  "DirectBootAware",
+			  "directBootAware",
+			  self          => self.DirectBootAware,
+			  (self, value) => self.DirectBootAware = (bool) value
+			}, {
 			  "Enabled",
 			  "enabled",
 			  self          => self.Enabled,
diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs
index 928d0f5cbe7..641282c7e47 100644
--- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs
+++ b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs
@@ -25,6 +25,9 @@ public ActivityAttribute ()
 		public bool                   AlwaysRetainTaskState   {get; set;}
 		public bool                   ClearTaskOnLaunch       {get; set;}
 		public ConfigChanges          ConfigurationChanges    {get; set;}
+#if ANDROID_24
+		public bool                   DirectBootAware         {get; set;}
+#endif
 		public bool                   Enabled                 {get; set;}
 		public bool                   ExcludeFromRecents      {get; set;}
 		public bool                   Exported                {get; set;}
diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
index c50cad8ed85..19adc3bce55 100644
--- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
+++ b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
@@ -28,6 +28,9 @@ public ApplicationAttribute ()
 #endif
 		public bool                   Debuggable              {get; set;}
 		public string                 Description             {get; set;}
+#if ANDROID_24
+		public bool                   DirectBootAware         {get; set;}
+#endif
 		public bool                   Enabled                 {get; set;}
 #if ANDROID_23
 		public bool                   ExtractNativeLibs       {get; set;}
diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs
index 47225e09c8e..384d7d4813d 100644
--- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs
+++ b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs
@@ -17,6 +17,9 @@ public ServiceAttribute ()
 
 		public string                 Name                    {get; set;}
 
+#if ANDROID_24
+		public bool                   DirectBootAware         {get; set;}
+#endif
 		public bool                   Enabled                 {get; set;}
 		public bool                   Exported                {get; set;}
 		public string                 Icon                    {get; set;}
diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
index 4cf17b2f170..3675ebc3822 100644
--- a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
+++ b/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
@@ -18,6 +18,9 @@ public ContentProviderAttribute (string[] authorities)
 		}
 
 		public string[]               Authorities             {get; private set;}
+#if ANDROID_24
+		public bool                   DirectBootAware         {get; set;}
+#endif
 		public bool                   Enabled                 {get; set;}
 		public bool                   Exported                {get; set;}
 		public bool                   GrantUriPermissions     {get; set;}