Merge TP1A.211006.001

Change-Id: I2377b422bafc0c15ce29ed663c0b7482bb27eb64