Merge mpr-2021-09-05

Change-Id: I6b36ee56dae17be8dbbcbf45d3aed0e0c5189562