Merge TP1A.211006.001

Change-Id: I01ce5bb99ee757ce372edded3e2c867b6de5815b