From 23f03832846a253a0a29952bf372e0475767f371 Mon Sep 17 00:00:00 2001
From: Hangfei Lin <hangfei@google.com>
Date: Sun, 20 Apr 2025 17:08:25 -0700
Subject: [PATCH] fix: The previous commit has a merge conflict. Fix it by
 adding this back.

The previous commit has a merge conflict. Fix it by adding this back.