Merge TP1A.220120.003

Change-Id: Icefd5afad3c57b17c9e1b4c98eab9cc2c673a507