Merge mpr-2021-11-05

Change-Id: I6ef1e4c77c06cb591350ebc4dee5543b356d2c88