Merge SQ3A.220605.009

Bug: 236045730
Merged-In: Id84c042e46b2c8af088a63182e36eda910a748e2
Change-Id: Ia8002b4fff23fe47843fb7dbf66f1f5c1fe77e98