Merge mpr-2021-11-05

Change-Id: Icb7ef50a6b9bbd0eb2dfb6362df88ff400de1d02