Merge mpr-2021-08-05

Change-Id: Idd61e4492b038b33501f7f03f9949340eb9e1bec