Merge SQ1A.220205.002

Bug: 213904741
Merged-In: Iea3d9328df33494eb998cbf55cf7d9ed91de7f0b
Change-Id: I03bc61a7caf0dfa77228c0bfea517a7bbcb64e31