Merge TP1A.211006.001

Change-Id: I8082931b0e8b2bd0c7bc3107ef2c7c96b9dfe306