Merge TP1A.211006.001

Change-Id: I582150b97968e1932e06260521b19ffe2e1689f0