[jdk17u-dev] RFR: Backport 987656d69065b5b61d658cec3704a181a4aef18b [v2]

[Shruthi]

> OpenJDK PR : https://github.com/openjdk/jdk/pull/9369
> OpenJDK bug : https://bugs.openjdk.org/browse/JDK-8289471

Shruthi has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains two commits:

 - Merge master
 - Backport 987656d69065b5b61d658cec3704a181a4aef18b

-------------

Changes: https://git.openjdk.org/jdk17u-dev/pull/598/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=598&range=01
  Stats: 5 lines in 2 files changed: 0 ins; 0 del; 5 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/598.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev pull/598/head:pull/598

PR: https://git.openjdk.org/jdk17u-dev/pull/598