Merge TP1A.211006.001

Change-Id: I6edbfd3e414aaa083e016c1268ab1e60e72b89d2