Merge s-mpr-2022-01-05

Change-Id: I7225ccdf32738f7c23abe245f19550ee71d946b8