Review request for JDK-8025163

[Hannes Wallnoefer]

Please review patch for https://bugs.openjdk.java.net/browse/JDK-8025163:

http://cr.openjdk.java.net/~hannesw/8025163/

Thanks,
Hannes