Merge branch 'upstream-import' into upstream-staging

Bug: b/322154153
Change-Id: I866261824c7a3604d7c412aff6ebfc481db50e20