Clean backport -------------
Commit messages: - Backport 37b725d9c12834358a562e6c03fb7f566d639ca5 Changes: https://git.openjdk.org/jdk/pull/27772/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=27772&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8369184 Stats: 102 lines in 2 files changed: 94 ins; 0 del; 8 mod Patch: https://git.openjdk.org/jdk/pull/27772.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/27772/head:pull/27772 PR: https://git.openjdk.org/jdk/pull/27772
