Merge TP1A.220107.002

Change-Id: Idccd2c2f39c1be922496d4658fbf54acdfc235b9