Merge TP1A.220120.003

Change-Id: I1b10454448d1b68b559c3fd9e0479a098afa070c