Merge TP1A.211006.001

Change-Id: I0682ec34a7e612cf1b8403d28bca7ea57f1659b2