Backport of https://bugs.openjdk.org/browse/JDK-8361497
Not clean due to the lack of https://bugs.openjdk.org/browse/JDK-8360884. The cherry pick conflict was caused by the a new test added in the JDK-8360884., [code](https://github.com/openjdk/jdk/commit/4df9c873452293ccde3c7dbcd64e1ced6b6af52e#diff-314e483e41a8dd49577b207c12683b369ab87b6de6da289b9f7e89aae5f412cbR227-R232). Based on the conversation in [JDK-8360884](https://bugs.openjdk.org/browse/JDK-8360884), it seems people are not comfortable to backport JDK-8360884 into 25 yet. The conflict was easy to resolve tho. Just remove the additional test brought by JDK-8360884. ------------- Commit messages: - Backport 9dd93c6a2c5fb4c3a9f2a063a7ab402f9292ad03 Changes: https://git.openjdk.org/jdk/pull/26976/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=26976&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8361497 Stats: 100 lines in 2 files changed: 85 ins; 0 del; 15 mod Patch: https://git.openjdk.org/jdk/pull/26976.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/26976/head:pull/26976 PR: https://git.openjdk.org/jdk/pull/26976
