--- old/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java	2019-03-12 16:18:53.581020800 +0530
+++ new/src/java.desktop/share/classes/javax/accessibility/AccessibleBundle.java	2019-03-12 16:18:51.969019200 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-
 import sun.awt.AWTAccessor;
 
 /**
@@ -50,7 +49,7 @@
  */
 public abstract class AccessibleBundle {
 
-    private static Hashtable<Locale, Hashtable<String, Object>> table = new Hashtable<>();
+    private static Hashtable<String, Hashtable<String, Object>> table = new Hashtable<>();
 
     private final String defaultResourceBundleName
         = "com.sun.accessibility.internal.resources.accessibility";
@@ -94,12 +93,14 @@
      */
     protected String toDisplayString(String resourceBundleName,
                                      Locale locale) {
-
         // loads the resource bundle if necessary
         loadResourceBundle(resourceBundleName, locale);
 
+        // use the resource bundle name and locale based tag
+        String hashCodeKey = resourceBundleName + locale.toLanguageTag();
+
         // returns the localized string
-        Hashtable<String, Object> ht = table.get(locale);
+        Hashtable<String, Object> ht = table.get(hashCodeKey);
         if (ht != null) {
             Object o = ht.get(key);
             if (o != null && o instanceof String) {
@@ -145,8 +146,10 @@
      */
     private void loadResourceBundle(String resourceBundleName,
                                     Locale locale) {
-        if (! table.containsKey(locale)) {
+        // use the resource bundle name and locale based tag
+        String hashCodeKey = resourceBundleName + locale.toLanguageTag();
 
+        if (! table.containsKey(hashCodeKey)) {
             try {
                 Hashtable<String, Object> resourceTable = new Hashtable<>();
 
@@ -158,7 +161,7 @@
                     resourceTable.put(key, bundle.getObject(key));
                 }
 
-                table.put(locale, resourceTable);
+                table.put(hashCodeKey, resourceTable);
             }
             catch (MissingResourceException e) {
                 System.err.println("loadResourceBundle: " + e);
--- /dev/null	2019-03-12 16:19:05.000000000 +0530
+++ new/test/jdk/javax/accessibility/AccessibleStateCheck/AccessibleStateCheck.java	2019-03-12 16:19:02.766263200 +0530
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /**
+   * @test
+   * @bug 8213516
+   * @summary jck test api/javax_accessibility/AccessibleState/fields.html fails intermittent
+   * @run main AccessibleStateCheck
+   */
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleBundle;
+import java.util.Locale;
+
+public class AccessibleStateCheck extends AccessibleBundle {
+
+    public static final AccessibleStateCheck MANAGES_DESCENDANTS
+        = new AccessibleStateCheck ("managesDescendants");
+
+    public static void main(String argv[]) {
+        AccessibleStateCheck accessibleStateCheck = new AccessibleStateCheck();
+        accessibleStateCheck.doTest();
+    }
+
+    private void doTest() {
+        // Verify in the default loaded properties file with english locale
+        if(!AccessibleStateCheck.MANAGES_DESCENDANTS.toDisplayString(java.util.Locale.ENGLISH).equals("manages descendants")) {
+            throw new RuntimeException("Got unexpected accessible state output");
+        }
+
+        // Verify a new properties file is loaded and verified against it with the same english locale
+        if(!AccessibleStateCheck.MANAGES_DESCENDANTS.toDisplayString("accessibilityEmpty",
+            java.util.Locale.ENGLISH).equals("managesDescendants")) {
+            throw new RuntimeException("Got unexpected accessible state output");
+        }
+    }
+
+    public AccessibleStateCheck(String key) {
+        this.key = key;
+    }
+
+    public AccessibleStateCheck() {
+        this.key = null;
+    }
+}
--- /dev/null	2019-03-12 16:19:13.000000000 +0530
+++ new/test/jdk/javax/accessibility/AccessibleStateCheck/accessibilityEmpty_en.properties	2019-03-12 16:19:10.751264600 +0530
@@ -0,0 +1,12 @@
+#
+# This properties file is used for testing purpose only
+#
+# @author  Shashidhara H V
+
+#
+# some accessible roles for testing
+#
+
+#
+# END
+#