Merge SQ1A.220205.002

Bug: 213904741
Merged-In: Ia73e8b7e745d26a44b6d8ec6deeae07fa7024363
Change-Id: I0f2c02f46b5eb694ade69dc0c290f08e46320a5b