Merge TP1A.211006.001

Change-Id: I43b2660e3753f68b31676b689bacf607c2e17d4e