Merge mpr-2021-09-05

Change-Id: Ie0c4aadbe0a4567b00fa4b078eda541783fdc949