webrev prepared against http://hg.openjdk.java.net/jdk9/client/jdk (OpenJDK 9) Bug ID: JDK-8137113