Merge SQ1A.220205.002

Bug: 213904741
Merged-In: I46c006741508e48b817ba393517e1ba6c335425a
Change-Id: I1aca43987de5c2cb7a3f1a9ad9be4d6e9eeb2d56