Merge mpr-2021-07-05

Change-Id: I0e74606c1b3826ee954a6407bba5883eed86afcf