Merge TP1A.211006.001

Change-Id: I85484ace325c8d3443eec7dd382d9961eb29def6