Merge TP1A.211006.001

Change-Id: I43527ae3b9f533e3fe1234e7e95bd2a1cfa9fee1