Merge SQ1A.220205.002

Bug: 213904741
Merged-In: Iced63aea2dd5443271e9a76628a09810182148f3
Change-Id: I8c44055a30b37da2ff0ac36c71ec8d2e1703cbeb