Merge TP1A.211006.001

Change-Id: I197406f382346355f96ce0c7a704488dd73b4175