Merge ASM_9_6 into main

Merges commit 85cf1aeb0d08be8446f6efbda962817d2a9707dd from
upstream.

Bug: 335612268
Test: TH
Change-Id: Ib15aaf36efdde8d172c1806db1addcc7871ecc4b