Merge mpr-2021-11-05

Change-Id: Ia24781cc6792c3ee4faa5ba98125e44d255c0bc9