Merge TP1A.220107.002

Change-Id: Ifbaf4fd30d6e60140d70165eb62765eb5fd6659d