Merge SP2A.220305.012

Bug: 219523960
Merged-In: I834fb190f857c5af462ed4a5e64576fee0010e3e
Change-Id: Idcec676925a93936e6f8146d1c3e553d7337bf9f