Merge r-mpr-2022-01-05

Change-Id: If64e493e584055345a20129b6a6b638bb5f84b43