Merge s-mpr-2022-01-05

Change-Id: I66b632fa2d224d67e3abfa57211d0f1effc3eb8f