diff --git a/.hgtags b/.hgtags
index 2de56991a364bef021d9f61334ce3c145f187144..2dbce587cc6ec96e85687dd3f4df8cce544d9982 100644
--- a/.hgtags
+++ b/.hgtags
@@ -327,4 +327,5 @@ d7d221f56fd17b96bab4440448641a844f9e92cd jdk8u25-b08
 eaaa9a04b9fdcfa4a830b811ed209eb2c45a4a6b jdk8u25-b12
 c3a855402b923d3ba819b05292a971953fc8ed0b jdk8u25-b13
 2a6df63ca0f0f59bb730638b05c72d77a23f93c8 jdk8u25-b14
+412d9ade90401d098f3662bd688ab393008423bd jdk8u25-b15
 f935349e2c065487c745bc41f81ddc7869bd2d2d jdk8u31-b00
diff --git a/src/share/classes/sun/awt/ComponentFactory.java b/src/share/classes/sun/awt/ComponentFactory.java
index e1d616f1d93e3091e8aaed7e32d4e859596247e8..4d167804722a65471da5da094b7d70b02a1ee5e2 100644
--- a/src/share/classes/sun/awt/ComponentFactory.java
+++ b/src/share/classes/sun/awt/ComponentFactory.java
@@ -25,6 +25,8 @@
 
 package sun.awt;
 
+import sun.awt.datatransfer.DataTransferer;
+
 import java.awt.*;
 import java.awt.dnd.*;
 import java.awt.dnd.peer.DragSourceContextPeer;
@@ -93,4 +95,6 @@ public interface ComponentFactory {
     RobotPeer createRobot(Robot target, GraphicsDevice screen)
         throws AWTException, HeadlessException;
 
+    DataTransferer getDataTransferer();
+
 }
diff --git a/src/share/classes/sun/awt/HeadlessToolkit.java b/src/share/classes/sun/awt/HeadlessToolkit.java
index 9d68bd48b1ea28d3428ff15addfe57e87d292d26..c0757be829ca9a7a1f4aa41c2bd7bf60b76c1c20 100644
--- a/src/share/classes/sun/awt/HeadlessToolkit.java
+++ b/src/share/classes/sun/awt/HeadlessToolkit.java
@@ -25,6 +25,8 @@
 
 package sun.awt;
 
+import sun.awt.datatransfer.DataTransferer;
+
 import java.awt.*;
 import java.awt.dnd.*;
 import java.awt.dnd.peer.DragSourceContextPeer;
@@ -401,6 +403,11 @@ public class HeadlessToolkit extends Toolkit
         return null;
     }
 
+    @Override
+    public DataTransferer getDataTransferer() {
+        return null;
+    }
+
     @SuppressWarnings("deprecation")
     public FontMetrics getFontMetrics(Font font) {
         return tk.getFontMetrics(font);
diff --git a/src/share/classes/sun/awt/SunToolkit.java b/src/share/classes/sun/awt/SunToolkit.java
index 08c3615ae49e0452da7a01626c4a56c8becc3cea..03d6245e5e798e82fa6a3d878ab11d309e5c8648 100644
--- a/src/share/classes/sun/awt/SunToolkit.java
+++ b/src/share/classes/sun/awt/SunToolkit.java
@@ -205,8 +205,6 @@ public abstract class SunToolkit extends Toolkit
 
     public abstract boolean isTraySupported();
 
-    public abstract DataTransferer getDataTransferer();
-
     @SuppressWarnings("deprecation")
     public abstract FontPeer getFontPeer(String name, int style);
 
diff --git a/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/src/share/classes/sun/awt/datatransfer/DataTransferer.java
index 2c4b75fcaac08d216794d67da234fecb35e9a938..c5a7f59197d573edaaf23ce617cddadb0ac34586 100644
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -86,6 +86,7 @@ import java.util.Stack;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import sun.awt.ComponentFactory;
 import sun.util.logging.PlatformLogger;
 
 import sun.awt.AppContext;
@@ -272,7 +273,7 @@ public abstract class DataTransferer {
      * instead, null will be returned.
      */
     public static synchronized DataTransferer getInstance() {
-        return ((SunToolkit) Toolkit.getDefaultToolkit()).getDataTransferer();
+        return ((ComponentFactory) Toolkit.getDefaultToolkit()).getDataTransferer();
     }
 
     /**