Merge mpr-2021-07-05

Change-Id: I3585fd88288026269a34b84d8a6e83315e362144