Merge mpr-2021-11-05

Change-Id: Ia6c238b27bc81dd2195b054c9199ce829d188008