Merge s-mpr-2022-01-05

Change-Id: Ifcc54d5d13a8c6ee1c68bb21c091211cbdcf2025