Merge mpr-2021-11-05

Change-Id: Ie29745d0c8840918bb5952e9303d4e5331353c09