RFR: JDK-8169505 - Update changes by JDK-8159393 to reflect CCC review

[Jim Laskey (Oracle)]

http://cr.openjdk.java.net/~jlaskey/8169505/webrev/index.html
https://bugs.openjdk.java.net/browse/JDK-8169505