Merge mpr-2021-06-05

Change-Id: I67b08ee48a20ce3c2b420f20c9119f9b368c77ed