Merge TP1A.211006.001

Change-Id: I243fafb727711c1fc326584790683b2e75795a40