--- old/src/java.base/share/classes/java/util/Locale.java	2018-04-23 15:34:06.826367012 -0700
+++ new/src/java.base/share/classes/java/util/Locale.java	2018-04-23 15:34:06.556361850 -0700
@@ -2189,9 +2189,9 @@
                 }
                 break;
             case "tz":
-                displayType = TimeZoneNameUtility.retrieveGenericDisplayName(
-                    TimeZoneNameUtility.convertLDMLShortID(type).orElse(type),
-                    TimeZone.LONG, inLocale);
+                displayType = TimeZoneNameUtility.convertLDMLShortID(type)
+                    .map(id -> TimeZoneNameUtility.retrieveGenericDisplayName(id, TimeZone.LONG, inLocale))
+                    .orElse(type);
                 break;
             }
             ret = MessageFormat.format(lr.getLocaleName("ListKeyTypePattern"),