Merge TP1A.211006.001

Change-Id: I0f62f2d1a8e3b6e80ac301a58add6dc4ffe71a7b