Merge TP1A.220107.002

Change-Id: Ib4c9d7bfd01f8a6192a92d8b822fb003c57d13d3