Merge mpr-2021-09-05

Change-Id: If8fcf17e54e7d65bc163bc4654228004fa78478a