Merge s-mpr-2022-01-05

Change-Id: I3727c08be46384b68ac2a66fbdae40d9ff1e3962