Merge TP1A.220107.002

Change-Id: I5661c5d6ec10a88549675a7af0637ea1d0318853