Merge r-mpr-2022-01-05

Change-Id: I3d066c2f164d14a82c6f2b4ca90a31e1e9b59554