Merge SQ3A.220605.009

Bug: 236045730
Merged-In: I080df3547361aef1aa259dd2b3dc9bdb860a0193
Change-Id: I29d097b885d9392ffe5f845f74d1501f4dd834d7