Merge TP1A.211006.001

Change-Id: Iabbf921dbe6db9c00f1755bfb81600eb3de93107