Merge SP2A.220505.002

Bug: 231319788
Merged-In: I0757557e66725dddfd871cd9857071a8749bd7ba
Change-Id: Ie0f1325f420d89d1d72b09f93082e6d4b025f852