backport 8133070

[莫简豪(坤谷)]

Hi Xuelei,
Thank you for fixing https://bugs.openjdk.java.net/browse/JDK-8133070 .I have 
been waiting for the backport https://bugs.openjdk.java.net/browse/JDK-8146057 
for months.
May be I can contribute my backport to help making this happen faster.
Attach please my backport. 
BTW, Alibaba has signed the OCA.
Regards,
Jianhao Mo

8133070.patch
Description: Binary data