Merge mpr-2021-11-05

Change-Id: I8fea53cc9081f1d72f7c3791543c131e8deaa5d9