Merge TP1A.220107.002

Change-Id: I3b87ebb24188543359e0cf0a7e4468d7b5e73c5c