Merge mpr-2021-11-05

Change-Id: Ic9cd80af7c41f25bf84bae19e25d267979151bcf