Merge SP2A.220305.012

Bug: 219523960
Merged-In: Id05927f26559e2137dccd5c37538e3534b7a8573
Change-Id: I543fd5de537d58b61ccdeff26208be4f314339b0