From b18d642962ad4d99ed6caf4e8caed6e948ee7cdc Mon Sep 17 00:00:00 2001
From: Allan Banaag <banaag@google.com>
Date: Fri, 1 Dec 2023 12:20:33 -0800
Subject: [PATCH] Validator rollup (#39668)

* cl/566699616 Two-way sync for PR #39466. No-op, or fixes merge conflicts, if any.

* cl/581994391 Two-way sync for PR #39558. No-op, or fixes merge conflicts, if any.

* cl/566699616 Two-way sync for PR #39466. No-op, or fixes merge conflicts, if any.