Merge r-mpr-2022-01-05

Change-Id: Id0f48a38f85b15b26cf282d49126c391d26da3d7