PiperOrigin-RevId: 695257954
requested review from @firiaye
assigned to @firiaye
merged
mentioned in commit 2e116019