Merge TP1A.211006.001

Change-Id: I4ca34b330348026eef712db08c676293fd736f40