Please review JDK-8012518

[Andreas Gabrielsson]

Webrev: http://cr.openjdk.java.net/~lagergren/8012518.2/

https://bugs.openjdk.java.net/browse/JDK-8012518