Integrated: Merge 5f6c85420a19d5dd9ccaf0a0c6e8f6502fab2aa7

[Jaikiran Pai]

This brings in CPU25_01 changes into 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/23231/files
  Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/jdk/pull/23231.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/23231/head:pull/23231

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