Merge TP1A.211006.001

Change-Id: I078f568494fdfb8296f9f47654a5a21d9ef624a1