Merge TP1A.220120.003

Change-Id: I187c02acecc6aa97672dfe817ebc93022dfae61c