Merge TP1A.211013.002

Change-Id: Ic9b42d6b3f289669d117812a23e34eb42c936782