diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/LayoutAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/LayoutAttribute.Partial.cs
index 70d9a81225c..ad44f0f04bd 100644
--- a/src/Xamarin.Android.Build.Tasks/Mono.Android/LayoutAttribute.Partial.cs
+++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/LayoutAttribute.Partial.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable enable
 
 using System;
 using System.Collections.Generic;
@@ -22,9 +22,9 @@ partial class LayoutAttribute
 		TypeDefinition? type;
 		ICollection<string>? specified;
 
-		public static LayoutAttribute FromTypeDefinition (TypeDefinition type, TypeDefinitionCache cache)
+		public static LayoutAttribute? FromTypeDefinition (TypeDefinition type, TypeDefinitionCache cache)
 		{
-			CustomAttribute attr = type.GetCustomAttributes ("Android.App.LayoutAttribute")
+			CustomAttribute? attr = type.GetCustomAttributes ("Android.App.LayoutAttribute")
 				.SingleOrDefault ();
 			if (attr == null)
 				return null;