Merge TP1A.211006.001

Change-Id: I933e10eda695bc0a3c6a5e8c07d09d49dd9729b3