Merge SQ1A.220205.002

Bug: 213904741
Merged-In: I8569e9369e4ab6f6c69c81b937f111c299b7a134
Change-Id: If5e4ac031bbea6d69b3a588566de5f759333c6e6