Merge TP1A.211006.001

Change-Id: I5863e212fbfd6b0a516ec67bf2be46633f656b16