Merge TP1A.220120.003

Change-Id: I04a1de2df2495029ae40a967e2d22f839b8fcab5