--- old/src/java.base/share/classes/java/util/Calendar.java	2019-07-25 13:49:15.306373500 -0700
+++ new/src/java.base/share/classes/java/util/Calendar.java	2019-07-25 13:49:14.946949900 -0700
@@ -2205,7 +2205,8 @@
         }
 
         String calendarType = getCalendarType();
-        if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style)) {
+        if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style) ||
+            field == ERA && (style & SHORT) == SHORT) {
             Map<String, Integer> map;
             map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field, style, locale);