Merge TP1A.220107.002

Change-Id: I5a2464621bae1dbb19aee280832bfef3ae80cae8