Merge s-mpr-2022-01-05

Change-Id: I0c134d764336c55fe0548105793a4d6ef8836f2c