Kevin, Please review the proposed fix. In this fix I also took the chance to fix the wildcard import issue in this file: https://bugs.openjdk.java.net/browse/JDK-8166933 http://cr.openjdk.java.net/~ckyang/JDK-8166933/webrev.00/ Thanks, - Chien