Update after #36962 (#36965)

Commit

266 days ago

Update after #36962 (#36965) update Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>