Merge mpr-2021-11-05

Change-Id: I53b429b345a1e922ed8e5e28f724c1985c75f0aa