Merge mpr-2021-11-05

Change-Id: I666885f8109b48758821e7ba050b44827bc1e365