JRE-1206 Backport JRE-1166 to Java 8

(cherry picked from commit 6d33c9232a9b6fa61c1c15286556dd99a35535d3)
1 file changed