Merge TP1A.211006.001

Change-Id: I5541851331e9ec8a52cf3a524895b474e542edf1