Merge mpr-2021-11-05

Change-Id: I0f6f7a5a55991d241eefbad9f4bc33ef09ab853f