Please review this 8u backport. The original patch applied cleanly. Bug: https://bugs.openjdk.java.net/browse/JDK-8221263 Original patch: http://hg.openjdk.java.net/jdk/jdk/rev/7f53d59593e2 8u backport: http://cr.openjdk.java.net/~zgu/JDK-8221263-8u/webrev.00/ Thanks, -Zhengyu