Merge s-mpr-2022-01-05

Change-Id: I38291448b567328240bec5beb3c76a70ef3c55ee