Merge s-mpr-2022-01-05

Change-Id: I78801fa06766baefc34ce9a3d6fbeda0d917e2c8