import commit 322980ec930adddccb1f4b6e9c4b6bcf346fed34
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index 615ccd6..29086ec 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -30,7 +30,18 @@
 include $(CLEAR_VARS)
 
 ##
-icu_data_file := $(LOCAL_PATH)/$(if $(findstring ja_JP,$(PRODUCT_LOCALES)),icudt38l-us-japan.dat,icudt38l-us-euro.dat)
+
+# Japanese wins if required.
+# US-Euro is needed for IT or PL builds
+# Default is suitable for CS, DE, EN, ES, FR, NL
+
+config := \
+	$(if $(findstring ja_JP,$(PRODUCT_LOCALES)),us-japan,\
+		$(if $(findstring it,$(PRODUCT_LOCALES)),us-euro,\
+			$(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro,\
+				default)))
+
+icu_data_file = $(addprefix $(LOCAL_PATH)/icudt38l-,$(addsuffix .dat,$(config)))
 icu_var_name := icudt38_dat
 ##