Merge TP1A.220107.002

Change-Id: I7780ba93f8026796ce7a45cd5da2e41450b8e6c4