Merge r-mpr-2022-01-05

Change-Id: I3dc2f9f607503f61c2c5382a1271c1c0aedfd113