Merge mpr-2021-11-05

Change-Id: I457a3d480653dc26b58d567939ae4c9072a9208c