Merge r-mpr-2022-01-05

Change-Id: Ia0dbf47b9bce345972d6cad291a1a660f04db2ee