Merge TP1A.211006.001

Change-Id: I4642dc77d224231e0e57787986d359b3111987c5