Merge SP2A.220505.002

Bug: 231319788
Merged-In: Ib3f917ebd81458bbe1a5f3e1d220f4ef5cec0294
Change-Id: I9a33b556267790821a70cde5e5fe0df7e21a9b81