Merge mpr-2021-06-05

Change-Id: I08280c929d1763f500470d7a71f4da0d7d2b753b