Merge TP1A.211006.001

Change-Id: Ic3d4261100af8fbf362bd6446c6d706d623475a4