Merge TP1A.211006.001

Change-Id: I09783b2347f3129a0272ed7cdf948375b124d92c