Merge TP1A.211006.001

Change-Id: I7fa27d829fde7554a5f56c5e1c2206095a20e73b