Merge r-mpr-2022-03-05

Change-Id: I919698eb5dbe4ed73a7a3d805d401865c3dbabe4