tree fdda313a808cabb9e019d052725cb052df7cb8d3
parent 734266b633f4dc61e17609983559ad8355a15b5f
author Zi Wang <mrziwang@google.com> 1696899366 -0700
committer Zi Wang <mrziwang@google.com> 1696899366 -0700

Address comments from aosp/2777928

Test: CI
Change-Id: I0d8ee145d797e44338b7eca91fda4177464d7bdb