Merge TP1A.220107.002

Change-Id: I8c374ea30ba1680aa861e2f6e88cc729b2c76d43