Merge mpr-2021-11-05

Change-Id: I446bec756f4007cd59b44203de009c6932b2e421