diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
index 8da2ddb3b5d..b7e433143d5 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
@@ -200,6 +200,9 @@ void Extract (
 						resolvedResourceDirectories.Add (resDir);
 					if (Directory.Exists (assemblyDir))
 						resolvedAssetDirectories.Add (assemblyDir);
+					foreach (var env in Directory.EnumerateFiles (importsDir, "__AndroidEnvironment__*", SearchOption.TopDirectoryOnly)) {
+						resolvedEnvironments.Add (env);
+					}
 					continue;
 				}
 
diff --git a/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs b/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs
index f22247a6e1b..2c970f56956 100644
--- a/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs
+++ b/tests/locales/Xamarin.Android.Locale-Tests/EnvironmentTests.cs
@@ -12,7 +12,7 @@ public class EnvironmentTests
 		public void EnvironmentVariablesFromLibraryProjectsAreMerged ()
 		{
 			var v = Environment.GetEnvironmentVariable ("THIS_IS_MY_ENVIRONMENT");
-			Assert.AreEqual (v, "Well, hello there!");
+			Assert.AreEqual ("Well, hello there!", v);
 		}
 	}
 }