Merge TP1A.211006.001

Change-Id: Ic425681c34a13500e5dc1e86c6243a1dfca03c83