Merge TP1A.211006.001

Change-Id: If6d02814bdc2610c969eacee9ba47fac6e31f4fc