Merge TP1A.211006.001

Change-Id: I9f94c7b87c5f3bdb484b88f3e6d91d2333c62621