Merge TP1A.220107.002

Change-Id: Ia7bc23ee5f69c3ab3760c524331041079dcf9e6a