Merge mpr-2021-11-05

Change-Id: I7615c71604dfefafe945016ae06fac8d55f8f84f