Merge r-mpr-2022-01-05

Change-Id: I8723c22f06521c9d7871246752a7b94f12c5c208