Merge TP1A.211006.001

Change-Id: Ib1b94d4d141e1cb3111294a5ac1c4f288c2633af