Merge mpr-2021-11-05

Change-Id: I3ea668c9ec0539ebb2b9636e438b8ffb2c377a59