Merge r-mpr-2022-01-05

Change-Id: I70120721ef5f69f54ca46d3ec2919b2c973ec1f4