Merge r-mpr-2022-01-05

Change-Id: Ie414d29ef7b29a8d84d2774e45f054dd04ae400f