Merge SQ1A.220205.002

Bug: 213904741
Merged-In: I716b4aded965af7730860804646317eae7321d7b
Change-Id: Icb300305fbacaf04ef421c4073a43e7a00bbeb56