Merge TP1A.220120.003

Change-Id: Ibd949a1fca1955c5e3d440962ce1c9c9c3b728ba