Merge mpr-2021-10-05

Change-Id: Icc5ce96ce15c2050b4b2132e5c6c653ed8d3c083