Merge TP1A.211006.001

Change-Id: I443e050ff1bef60e0bdedaa34d2b4e7789cf293c