Merge mpr-2021-09-05

Change-Id: I350fd763729bdffa1684b4920d54c157c391fda2