Merge SQ3A.220605.009

Bug: 236045730
Merged-In: Ied6993c47b58515ca47f9c53f0854a1f5a3628d6
Change-Id: I18042baffc48e807a7dd4b12e09c87dba7efbce7