Merge r-mpr-2022-01-05

Change-Id: Ib188f61f9bd29cf2a642b6181063863aa3489406