Merge r-mpr-2022-01-05

Change-Id: Ic05b55d122e0cdb68471892d9a405d58f5f50ca3