Merge SP2A.220505.002

Bug: 231319788
Merged-In: I13ce48b201651ccf2ba815a5c0308eb06253f507
Change-Id: I8212bf57a47ab2973caf329d97be5234a9d1051d