Merge TP1A.211006.001

Change-Id: I3ef8a9c38a4f458247d40494d4b520b5ea04d0ec