Merge TP1A.211006.001

Change-Id: Ieaa78f77f177e59d5d1ca0527bbc68e468aad80f