Merge TP1A.220107.002

Change-Id: I0d9aab634e0d5a281eaccd6f3d7cba312904ce1e