Merge TP1A.211006.001

Change-Id: I496d70897a8fc44a7cd3b5f47cf35583a64275ea