Merge r-mpr-2022-01-05

Change-Id: I0d3447a1abeb94ff5018bf217ab4874df792d677