Merge TP1A.211006.001

Change-Id: I38f6bd8d93a7cc3618f304ba483a19176f45b9e3