Merge TP1A.220120.003

Change-Id: I7a6d8a635ec06e2457d4c36864d1454b9d67d217