Merge from KonaJDK 8.0.17

[shiyuexw]

No description provided.

[tencent-adm]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ johnshajiang
❌ 946918940
_{You have signed the CLA already but the status is still pending? Let us recheck it.}