Merge SP2A.220305.012

Bug: 219523960
Merged-In: If597efa6bfc9d0a606a12bf09babb32e1ee3d3b4
Change-Id: If2ee6468bb8be7d4da2aa8843a2bb52c132fcf6a