Merge r-mpr-2022-01-05

Change-Id: I04f0eb9b7fd161d4c7f9cf3d862e93835be2b6fa