diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AndroidResource.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AndroidResource.cs
index 629be141b66..e9bcb993d9b 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/AndroidResource.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AndroidResource.cs
@@ -192,6 +192,15 @@ private static bool TryFixFragment (XAttribute attr, Dictionary<string, string>
 
 					return true;
 				}
+				else if (attr.Value?.Contains (',') ?? false) {
+					// attr.Value could be an assembly-qualified name that isn't in acw-map.txt;
+					// see e5b1c92c, https://github.com/xamarin/xamarin-android/issues/1296#issuecomment-365091948
+					var n = attr.Value.Substring (0, attr.Value.IndexOf (','));
+					if (acwMap.ContainsKey (n)) {
+						attr.Value = acwMap [n];
+						return true;
+					}
+				}
 			}
 
 			return false;