Cherry-pick of fc35aae onto release/2.37 had conflicts.
To resolve:
  git fetch origin backport/28660-to-2.37
  git checkout backport/28660-to-2.37
  git cherry-pick -x -m1 fc35aae
  # resolve conflicts
  git push origin backport/28660-to-2.37

… on entitlement (#28660)

(cherry picked from commit fc35aae)