Merge r-mpr-2022-01-05

Change-Id: Ib4ad32310447ae0451af781e4a503d3ec5175dfc