Merge TP1A.220107.002

Change-Id: I174fa57d877238d372066198d298d69c86218be8