Merge TP1A.211006.001

Change-Id: Ie85ea6079c728c12949a880aff13a5e572569dc7