Merge TP1A.211006.001

Change-Id: I90c286c4f2b473517a1a6ed1d96e5370ea6567ee