Merge TP1A.220120.003

Change-Id: Ib99ddd86326d65eeaa24d9233cc65a4a16a416aa