Merge r-mpr-2022-01-05

Change-Id: Ic47027e9f21f8b66badfa6fa9c21ac3ff9aa94f8