Merge TP1A.220107.002

Change-Id: I6d15d25a43ed43b6bb8c6180fce95d348393c6c3