Merge TP1A.211006.001

Change-Id: Iae321b3189365986ed08fc2807b19c3e00d8a50b