Merge SP2A.220305.012

Bug: 219523960
Merged-In: Ieacbda965aa99bf85be92b01035384fbc6a3787f
Change-Id: I31fed61140ac2618b9bbea0bf1043a62263c1ef6