Merge s-mpr-2022-01-05

Change-Id: If1439913be491017cc9c0d3c00e678851d21583a