Merge mpr-2021-07-05

Change-Id: Ia7019dbcf6733b2ddd5d57db19aadeb0a8f7deda