Merge TP1A.211006.001

Change-Id: I0367c52626398dca9fb33ba5c645101eedb097fa