Integrated: Merge ed30fce6df57b1cbf7a6efebabc3558550f8ec16

[Jaikiran Pai]

This brings in the CPU25_04 changes into the master branch.

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

Commit messages:


The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.org/jdk/pull/24683/files
  Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/jdk/pull/24683.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/24683/head:pull/24683

PR: https://git.openjdk.org/jdk/pull/24683