Merge r-mpr-2022-01-05

Change-Id: Ic89f214e71e8fed268dc9abd9504188abfbb2a6c