Merge TP1A.211006.001

Change-Id: Icc8fba25c4981662f99f4414357c9e8bb432cd6c