tree bf82f1a0d4c4a7b336c70508dc8dbc3425ca6cea
parent 315843c5ac933c3008419a9bca4afb5de5365d25
parent df0bade98505f6ec38d0790a7e9cd25a02b615bc
author Sam Leffler <sleffler@google.com> 1737676000 -0800
committer Sam Leffler <sleffler@google.com> 1737745592 -0800

Merge remote-tracking branch 'upstream/main' into update

NB: this requires the 2025-01-21 toolchain (or later)

Change-Id: If26a2fae909bcc734de2a7f024eba27a244fdece