Merge mpr-2021-11-05

Change-Id: Ic66c41cb89eb264c5062b49f899a2d3d3d72e9c9