Merge mpr-2021-11-05

Change-Id: If665bba294eb9fcef1c9a1327b967bd7554bd9ae