Merge mpr-2021-09-05

Change-Id: I4041ed97cb9d2cba1b49220a8becb8b2c552eff0