Merge TP1A.211006.001

Change-Id: I8ee5be49162621999eb0b9d373e92afd122aca73