Merge TP1A.220120.003

Change-Id: I0ac27049e4e6f02e293d5ca226c414098fa7c93d