Merge mpr-2021-11-05

Change-Id: Ic6032df684388855f7cb947207d8c8ade6955d1b