Merge TP1A.211006.001

Change-Id: I17ddde245622f61df4be129bf05ba8074d629aca