Merge TP1A.220107.002

Change-Id: Ifc1654e37b85019808a18a822b1b0951701fb28a