Merge mpr-2021-11-05

Change-Id: I06e08376d149d112df3ff094721aef8c75515377