Merge SP2A.220305.012

Bug: 219523960
Merged-In: I51cb81718a489ad7568c5e05ace0b3dbc6ca5443
Change-Id: Icf0cc432ab3a97614b27efcf6fc9d18ea423a743