Merge mpr-2021-11-05

Change-Id: I1440641e4d1d05d4d4c17344ff0499a17ddc477b