Merge mpr-2021-09-05

Change-Id: If143b1331ae7357ee265244bbe508e755a7139d1