Merge mpr-2021-11-05

Change-Id: I3e28f699067e24934769cc023e0ce78c833139f0