Merge r-mpr-2022-01-05

Change-Id: I80560f42b3da92ca447731e3e33a15525d031e64