Merge mpr-2021-11-05

Change-Id: Idf670e3c1f295e7f219123dfb204949b5066ebbc