Merge TP1A.211006.001

Change-Id: I1868a3bad6b77a9dd87f223aac76ec7f2752bf58