Merge TP1A.211006.001

Change-Id: Iefa2d3baccd817a9757d54a67d318750d534a03b