Merge mpr-2021-07-05

Change-Id: I7f64f5c95eb007c3d342f451e737fb327338d482