Merge TP1A.211006.001

Change-Id: Ia0d4b5d1a34ae0548c4dd817e15441dd8a3ce7ef