Merge TP1A.220107.002

Change-Id: Ic5eaa94e75fd1c37f3ea25f558f5021fe232aa60