Merge TP1A.211006.001

Change-Id: Ie510856288f8ed0da0c3d460bb0af87a0e59541d