Merge TP1A.211006.001

Change-Id: I67bfad77c35ffa72c5d5ed4d3309e438d1952930