Merge mpr-2021-11-05

Change-Id: Ib3f7784fd98003699aef254f73e94ed3d953d404